[geeklog-cvs] Geeklog-1.x/sql/updates mysql_1.4.1_to_1.5.0.php, 1.68, 1.69

[Dirk Haun]

Update of /cvsroot/geeklog/Geeklog-1.x/sql/updates
In directory qs1489.pair.com:/tmp/cvs-serv92558/sql/updates

Modified Files:
	mysql_1.4.1_to_1.5.0.php 
Log Message:
Polls plugin configuration


Index: mysql_1.4.1_to_1.5.0.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.5.0.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** mysql_1.4.1_to_1.5.0.php	8 Mar 2008 21:53:34 -0000	1.68
--- mysql_1.4.1_to_1.5.0.php	15 Mar 2008 18:11:43 -0000	1.69
***************
*** 356,360 ****
  function upgrade_PollsPlugin()
  {
!     global $_TABLES;
  
      $P_SQL = array();
--- 356,376 ----
  function upgrade_PollsPlugin()
  {
!     global $_CONF, $_TABLES;
! 
!     require_once $_CONF['path_system'] . 'classes/config.class.php';
! 
!     $plugin_path = $_CONF['path'] . 'plugins/polls/';
!     require_once $plugin_path . 'install_defaults.php';
! 
!     if (file_exists($plugin_path . 'config.php')) {
!         global $_PO_CONF;
! 
!         require_once $plugin_path . 'config.php';
!     }
! 
!     if (!plugin_initconfig_polls()) {
!         echo 'There was an error upgrading the Polls plugin';
!         return false;
!     }
  
      $P_SQL = array();
***************
*** 405,408 ****
--- 421,430 ----
              return false;
          }
+     }
+ 
+     if (file_exists($plugin_path . 'config.php')) {
+         // Rename the existing config.php as it's not needed any more
+         $ren = @rename($plugin_path . 'config.php',
+                        $plugin_path . 'config-pre1.5.0.php');
      }