[geeklog-cvs] geeklog: Fixed Polls upgrade problems dealing with adding config...

[geeklog-cvs at lists.geeklog.net]

changeset 8533:c0e00e31ca24
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/c0e00e31ca24
user: Tom <websitemaster at cogeco.net>
date: Tue Mar 13 09:23:31 2012 -0400
description:
Fixed Polls upgrade problems dealing with adding configuration options and security for the tabs.

diffstat:

 plugins/polls/functions.inc         |  13 +++++++++----
 plugins/polls/sql/mssql_updates.php |   2 --
 plugins/polls/sql/mysql_updates.php |   2 --
 plugins/polls/sql/pgsql_updates.php |   2 --
 4 files changed, 9 insertions(+), 10 deletions(-)

diffs (69 lines):

diff -r c4d1865f2cfd -r c0e00e31ca24 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc	Tue Mar 13 09:21:24 2012 -0400
+++ b/plugins/polls/functions.inc	Tue Mar 13 09:23:31 2012 -0400
@@ -1238,10 +1238,15 @@
             }
 
             if (! $current_config) {
+                // Update to Config Tables must be performed here and not in regualar SQL update array since if config is current then they shouldn't be run   
+                // Set new Tab column to whatever fieldset is
+                $sql = "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'polls'";
+                DB_query($sql);                
+        
                 polls_update_ConfValues_2_1_2();
+            }
 
-                polls_update_ConfigSecurity_2_1_2();
-            }
+            polls_update_ConfigSecurity_2_1_2();
 
             $current_version = '2.1.3';
             break;
@@ -1256,9 +1261,9 @@
 
             if (! $current_config) {
                 polls_update_ConfValues_2_1_3();
-                
-                polls_update_ConfigSecurity_2_1_3();
             }
+            
+            polls_update_ConfigSecurity_2_1_3();
 
             $current_version = '2.1.4';
             break;            
diff -r c4d1865f2cfd -r c0e00e31ca24 plugins/polls/sql/mssql_updates.php
--- a/plugins/polls/sql/mssql_updates.php	Tue Mar 13 09:21:24 2012 -0400
+++ b/plugins/polls/sql/mssql_updates.php	Tue Mar 13 09:23:31 2012 -0400
@@ -85,8 +85,6 @@
     ),
 
     '2.1.2' => array(
-        // Set new Tab column to whatever fieldset is
-        "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'polls'",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_whatsnew', 'Access to configure polls what\'s new block', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_main', 'Access to configure general polls settings', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_permissions', 'Access to configure polls default permissions', 0)",
diff -r c4d1865f2cfd -r c0e00e31ca24 plugins/polls/sql/mysql_updates.php
--- a/plugins/polls/sql/mysql_updates.php	Tue Mar 13 09:21:24 2012 -0400
+++ b/plugins/polls/sql/mysql_updates.php	Tue Mar 13 09:23:31 2012 -0400
@@ -79,8 +79,6 @@
     ),
 
     '2.1.2' => array(
-        // Set new Tab column to whatever fieldset is
-        "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'polls'",   
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_whatsnew', 'Access to configure polls what\'s new block', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_main', 'Access to configure general polls settings', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_permissions', 'Access to configure polls default permissions', 0)",
diff -r c4d1865f2cfd -r c0e00e31ca24 plugins/polls/sql/pgsql_updates.php
--- a/plugins/polls/sql/pgsql_updates.php	Tue Mar 13 09:21:24 2012 -0400
+++ b/plugins/polls/sql/pgsql_updates.php	Tue Mar 13 09:23:31 2012 -0400
@@ -35,8 +35,6 @@
 $_UPDATES = array(
 
     '2.1.2' => array(
-        // Set new Tab column to whatever fieldset is
-        "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'polls'",   
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_whatsnew', 'Access to configure polls what\'s new block', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_main', 'Access to configure general polls settings', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_permissions', 'Access to configure polls default permissions', 0)",