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

[geeklog-cvs at lists.geeklog.net]

changeset 8534:225267dce1cd
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/225267dce1cd
user: Tom <websitemaster at cogeco.net>
date: Tue Mar 13 09:25:11 2012 -0400
description:
Fixed Staticpages upgrade problems dealing with adding configuration options and security for the tabs.

diffstat:

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

diffs (70 lines):

diff -r c0e00e31ca24 -r 225267dce1cd plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Tue Mar 13 09:23:31 2012 -0400
+++ b/plugins/staticpages/functions.inc	Tue Mar 13 09:25:11 2012 -0400
@@ -1397,10 +1397,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 = 'staticpages'";
+                DB_query($sql);
+                
                 SP_update_ConfValues_1_6_3();
-
-                SP_update_ConfigSecurity_1_6_3();
             }
+            
+            SP_update_ConfigSecurity_1_6_3();
 
             $current_version = '1.6.4';
             break;
@@ -1415,10 +1420,10 @@
 
             if (! $current_config) {
                 SP_update_ConfValues_1_6_4();
-                
-                SP_update_TopicAssignmentsFor_1_6_4();
             }
 
+            SP_update_TopicAssignmentsFor_1_6_4();
+
             $current_version = '1.6.5';
             break; 
             
diff -r c0e00e31ca24 -r 225267dce1cd plugins/staticpages/sql/mssql_updates.php
--- a/plugins/staticpages/sql/mssql_updates.php	Tue Mar 13 09:23:31 2012 -0400
+++ b/plugins/staticpages/sql/mssql_updates.php	Tue Mar 13 09:25:11 2012 -0400
@@ -61,8 +61,6 @@
     ),
     
     '1.6.3' => array(
-        // Set new Tab column to whatever fieldset is
-        "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'staticpages'",   
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.staticpages.tab_main', 'Access to configure static pages main settings', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.staticpages.tab_whatsnew', 'Access to configure static pages what\'s new block', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.staticpages.tab_search', 'Access to configure static pages search results', 0)",
diff -r c0e00e31ca24 -r 225267dce1cd plugins/staticpages/sql/mysql_updates.php
--- a/plugins/staticpages/sql/mysql_updates.php	Tue Mar 13 09:23:31 2012 -0400
+++ b/plugins/staticpages/sql/mysql_updates.php	Tue Mar 13 09:25:11 2012 -0400
@@ -62,8 +62,6 @@
     ),
     
     '1.6.3' => array(
-        // Set new Tab column to whatever fieldset is
-        "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'staticpages'",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.staticpages.tab_main', 'Access to configure static pages main settings', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.staticpages.tab_whatsnew', 'Access to configure static pages what\'s new block', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.staticpages.tab_search', 'Access to configure static pages search results', 0)",
diff -r c0e00e31ca24 -r 225267dce1cd plugins/staticpages/sql/pgsql_updates.php
--- a/plugins/staticpages/sql/pgsql_updates.php	Tue Mar 13 09:23:31 2012 -0400
+++ b/plugins/staticpages/sql/pgsql_updates.php	Tue Mar 13 09:25:11 2012 -0400
@@ -40,8 +40,6 @@
     ),
     
     '1.6.3' => array(
-        // Set new Tab column to whatever fieldset is
-        "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'staticpages'",   
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.staticpages.tab_main', 'Access to configure static pages main settings', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.staticpages.tab_whatsnew', 'Access to configure static pages what\'s new block', 0)",
         "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.staticpages.tab_search', 'Access to configure static pages search results', 0)",