[geeklog-cvs] Geeklog-1.x/sql/updates mysql_1.4.1_to_1.4.2.php, 1.15, 1.16

[Dirk Haun]

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

Modified Files:
	mysql_1.4.1_to_1.4.2.php 
Log Message:
Fixed and re-activated Polls plugin upgrade


Index: mysql_1.4.1_to_1.4.2.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/sql/updates/mysql_1.4.1_to_1.4.2.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mysql_1.4.1_to_1.4.2.php	28 Jul 2007 20:21:13 -0000	1.15
--- mysql_1.4.1_to_1.4.2.php	28 Jul 2007 20:32:16 -0000	1.16
***************
*** 25,32 ****
  $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} ADD rdf_etag VARCHAR(40) DEFAULT NULL AFTER rdf_last_modified";
  
! function upgrade_PollPlugin()
  {
      global $_TABLES;
!     // Poll plugin updates
      $check_sql = "SELECT pi_name FROM {$_TABLES['plugins']} WHERE pi_name = 'polls';";
      $check_rst = DB_query ($check_sql);
--- 25,33 ----
  $_SQL[] = "ALTER TABLE {$_TABLES['blocks']} ADD rdf_etag VARCHAR(40) DEFAULT NULL AFTER rdf_last_modified";
  
! function upgrade_PollsPlugin()
  {
      global $_TABLES;
! 
!     // Polls plugin updates
      $check_sql = "SELECT pi_name FROM {$_TABLES['plugins']} WHERE pi_name = 'polls';";
      $check_rst = DB_query ($check_sql);
***************
*** 43,47 ****
          $P_SQL[] = "ALTER TABLE `{$_TABLES['pollvoters']}` CHANGE `qid` `pid` VARCHAR( 20 ) NOT NULL";
          $P_SQL[] = "CREATE TABLE {$_TABLES['pollquestions']} (
!               qid mediumint(9) NOT NULL DEFAULT '0',
                pid varchar(20) NOT NULL,
                question varchar(255) NOT NULL,
--- 44,48 ----
          $P_SQL[] = "ALTER TABLE `{$_TABLES['pollvoters']}` CHANGE `qid` `pid` VARCHAR( 20 ) NOT NULL";
          $P_SQL[] = "CREATE TABLE {$_TABLES['pollquestions']} (
!               qid mediumint(9) NOT NULL auto_increment,
                pid varchar(20) NOT NULL,
                question varchar(255) NOT NULL,