[geeklog-cvs] geeklog: Fixed upgrade

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/b3b624090a6b
changeset: 7235:b3b624090a6b
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Aug 08 17:07:11 2009 +0200
description:
Fixed upgrade

diffstat:

 public_html/admin/install/index.php       |  2 +-
 public_html/admin/install/lib-upgrade.php |  2 +-
 sql/updates/mssql_1.6.0_to_1.6.1.php      |  5 +++--
 sql/updates/mysql_1.6.0_to_1.6.1.php      |  4 +++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r 9c9933e74ff4 -r b3b624090a6b public_html/admin/install/index.php
--- a/public_html/admin/install/index.php	Sat Aug 08 14:13:01 2009 +0200
+++ b/public_html/admin/install/index.php	Sat Aug 08 17:07:11 2009 +0200
@@ -339,7 +339,7 @@
                               . '<p>' . $LANG_INSTALL[91] . '</p>';
                 } else {
 
-                    $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1','1.5.0','1.5.1','1.5.2');
+                    $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7','1.3.8','1.3.9','1.3.10','1.3.11','1.4.0','1.4.1','1.5.0','1.5.1','1.5.2','1.6.0');
                     if (empty($curv)) {
                         // If we were unable to determine the current GL
                         // version is then ask the user what it is
diff -r 9c9933e74ff4 -r b3b624090a6b public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php	Sat Aug 08 14:13:01 2009 +0200
+++ b/public_html/admin/install/lib-upgrade.php	Sat Aug 08 17:07:11 2009 +0200
@@ -478,7 +478,7 @@
             require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.6.0_to_1.6.1.php';
             INST_updateDB($_SQL);
 
-            update_ConfValues();
+            update_ConfValuesFor161();
 
             $current_gl_version = '1.6.1';
             $_SQL = '';
diff -r 9c9933e74ff4 -r b3b624090a6b sql/updates/mssql_1.6.0_to_1.6.1.php
--- a/sql/updates/mssql_1.6.0_to_1.6.1.php	Sat Aug 08 14:13:01 2009 +0200
+++ b/sql/updates/mssql_1.6.0_to_1.6.1.php	Sat Aug 08 17:07:11 2009 +0200
@@ -7,12 +7,14 @@
  * Add new config options
  *
  */
-function update_ConfValues()
+function update_ConfValuesFor161()
 {
     global $_CONF, $_TABLES;
 
     require_once $_CONF['path_system'] . 'classes/config.class.php';
 
+    $c = config::get_instance();
+
     // meta tag config options.
     $c->add('meta_tags',0,'select',0,0,23,2000,TRUE);
     $c->add('meta_description','Geeklog, the open source content management system designed with security in mind.','text',0,0,NULL,2010,TRUE);
@@ -21,5 +23,4 @@
     return true;
 }
 
-
 ?>
diff -r 9c9933e74ff4 -r b3b624090a6b sql/updates/mysql_1.6.0_to_1.6.1.php
--- a/sql/updates/mysql_1.6.0_to_1.6.1.php	Sat Aug 08 14:13:01 2009 +0200
+++ b/sql/updates/mysql_1.6.0_to_1.6.1.php	Sat Aug 08 17:07:11 2009 +0200
@@ -7,12 +7,14 @@
  * Add new config options
  *
  */
-function update_ConfValues()
+function update_ConfValuesFor161()
 {
     global $_CONF, $_TABLES;
 
     require_once $_CONF['path_system'] . 'classes/config.class.php';
 
+    $c = config::get_instance();
+
     // meta tag config options.
     $c->add('meta_tags',0,'select',0,0,23,2000,TRUE);
     $c->add('meta_description','Geeklog, the open source content management system designed with security in mind.','text',0,0,NULL,2010,TRUE);