[geeklog-cvs] geeklog: Retrofitted 1.5.2 updates
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Wed Jan 7 03:53:36 EST 2009
details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/8817f62abd8a
changeset: 6665:8817f62abd8a
user: Dirk Haun <dirk at haun-online.de>
date: Tue Jan 06 16:27:45 2009 +0100
description:
Retrofitted 1.5.2 updates
diffstat:
9 files changed, 71 insertions(+), 38 deletions(-)
public_html/admin/install/index.php | 2 +-
public_html/admin/install/lib-upgrade.php | 13 +++++++++++--
public_html/siteconfig.php.dist | 2 +-
sql/updates/mssql_1.5.1_to_1.5.2.php | 12 ++++++++++++
sql/updates/mssql_1.5.1_to_1.6.0.php | 17 -----------------
sql/updates/mssql_1.5.2_to_1.6.0.php | 17 +++++++++++++++++
sql/updates/mysql_1.5.1_to_1.5.2.php | 12 ++++++++++++
sql/updates/mysql_1.5.1_to_1.6.0.php | 17 -----------------
sql/updates/mysql_1.5.2_to_1.6.0.php | 17 +++++++++++++++++
diffs (177 lines):
diff -r 4ea7ea065d70 -r 8817f62abd8a public_html/admin/install/index.php
--- a/public_html/admin/install/index.php Tue Jan 06 13:10:01 2009 +0100
+++ b/public_html/admin/install/index.php Tue Jan 06 16:27:45 2009 +0100
@@ -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');
+ $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');
if (empty($curv)) {
// If we were unable to determine the current GL
// version is then ask the user what it is
diff -r 4ea7ea065d70 -r 8817f62abd8a public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php Tue Jan 06 13:10:01 2009 +0100
+++ b/public_html/admin/install/lib-upgrade.php Tue Jan 06 16:27:45 2009 +0100
@@ -452,8 +452,15 @@
break;
case '1.5.1':
- case '1.5.2': // TBD
- require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.5.1_to_1.6.0.php';
+ require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.5.1_to_1.5.2.php';
+ INST_updateDB($_SQL);
+
+ $current_gl_version = '1.5.2';
+ $_SQL = '';
+ break;
+
+ case '1.5.2':
+ require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.5.2_to_1.6.0.php';
update_ConfValues();
@@ -504,6 +511,7 @@
case 'mysql':
$test = array(
+ '1.5.2' => array("SELECT value FROM {$_TABLES['vars']} WHERE name = 'database_version'", '1.5.2'),
'1.5.1' => array("SELECT name FROM {$_TABLES['vars']} WHERE name = 'database_version'", 'database_version'),
'1.5.0' => array("DESCRIBE {$_TABLES['storysubmission']} bodytext",''),
'1.4.1' => array("SELECT ft_name FROM {$_TABLES['features']} WHERE ft_name = 'syndication.edit'", 'syndication.edit'),
@@ -526,6 +534,7 @@
case 'mssql':
$test = array(
+ '1.5.2' => array("SELECT value FROM {$_TABLES['vars']} WHERE name = 'database_version'", '1.5.2'),
'1.5.1' => array("SELECT name FROM {$_TABLES['vars']} WHERE name = 'database_version'", 'database_version'),
'1.5.0' => array("SELECT c.name FROM syscolumns c JOIN sysobjects o ON o.id = c.id WHERE c.name='bodytext' AND o.name='{$_TABLES['storysubmission']}'",'bodytext'),
'1.4.1' => array("SELECT ft_name FROM {$_TABLES['features']} WHERE ft_name = 'syndication.edit'", 'syndication.edit')
diff -r 4ea7ea065d70 -r 8817f62abd8a public_html/siteconfig.php.dist
--- a/public_html/siteconfig.php.dist Tue Jan 06 13:10:01 2009 +0100
+++ b/public_html/siteconfig.php.dist Tue Jan 06 16:27:45 2009 +0100
@@ -20,7 +20,7 @@
// If you have errors on your site, can't login, or can't get to the
// config UI, then you can comment this in to set the root debug option
// on and get detailed error messages. You can set this to 'force' (which the
-// Config UI won't allow you to do, to override hiding of password and cookie
+// Config UI won't allow you to do) to override hiding of password and cookie
// items in the debug trace.
// $_CONF['rootdebug'] = true;
diff -r 4ea7ea065d70 -r 8817f62abd8a sql/updates/mssql_1.5.1_to_1.5.2.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/updates/mssql_1.5.1_to_1.5.2.php Tue Jan 06 16:27:45 2009 +0100
@@ -0,0 +1,12 @@
+<?php
+
+// There weren't any database changes in Geeklog 1.5.2, but all the plugins
+// had bugfixes, so let's increase their version numbers ...
+
+$_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.0.3', pi_gl_version = '1.5.0' WHERE pi_name = 'calendar'";
+$_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0.1', pi_gl_version = '1.5.0' WHERE pi_name = 'links'";
+$_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0.2', pi_gl_version = '1.5.0' WHERE pi_name = 'polls'";
+$_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.1.2', pi_gl_version = '1.5.0' WHERE pi_name = 'spamx'";
+$_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.5.1', pi_gl_version = '1.5.0' WHERE pi_name = 'staticpages'";
+
+?>
diff -r 4ea7ea065d70 -r 8817f62abd8a sql/updates/mssql_1.5.1_to_1.6.0.php
--- a/sql/updates/mssql_1.5.1_to_1.6.0.php Tue Jan 06 13:10:01 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?php
-
-function update_ConfValues()
-{
- global $_CONF;
-
- require_once $_CONF['path_system'] . 'classes/config.class.php';
-
- $c = config::get_instance();
-
- // new option
- $c->add('jpeg_quality',75,'text',5,23,NULL,1495,FALSE);
-
- return true;
-}
-
-?>
diff -r 4ea7ea065d70 -r 8817f62abd8a sql/updates/mssql_1.5.2_to_1.6.0.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/updates/mssql_1.5.2_to_1.6.0.php Tue Jan 06 16:27:45 2009 +0100
@@ -0,0 +1,17 @@
+<?php
+
+function update_ConfValues()
+{
+ global $_CONF;
+
+ require_once $_CONF['path_system'] . 'classes/config.class.php';
+
+ $c = config::get_instance();
+
+ // new option
+ $c->add('jpeg_quality',75,'text',5,23,NULL,1495,FALSE);
+
+ return true;
+}
+
+?>
diff -r 4ea7ea065d70 -r 8817f62abd8a sql/updates/mysql_1.5.1_to_1.5.2.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/updates/mysql_1.5.1_to_1.5.2.php Tue Jan 06 16:27:45 2009 +0100
@@ -0,0 +1,12 @@
+<?php
+
+// There weren't any database changes in Geeklog 1.5.2, but all the plugins
+// had bugfixes, so let's increase their version numbers ...
+
+$_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.0.3' WHERE pi_name = 'calendar'";
+$_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0.1' WHERE pi_name = 'links'";
+$_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '2.0.2' WHERE pi_name = 'polls'";
+$_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.1.2' WHERE pi_name = 'spamx'";
+$_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version = '1.5.1' WHERE pi_name = 'staticpages'";
+
+?>
diff -r 4ea7ea065d70 -r 8817f62abd8a sql/updates/mysql_1.5.1_to_1.6.0.php
--- a/sql/updates/mysql_1.5.1_to_1.6.0.php Tue Jan 06 13:10:01 2009 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?php
-
-function update_ConfValues()
-{
- global $_CONF;
-
- require_once $_CONF['path_system'] . 'classes/config.class.php';
-
- $c = config::get_instance();
-
- // new option
- $c->add('jpeg_quality',75,'text',5,23,NULL,1495,FALSE);
-
- return true;
-}
-
-?>
diff -r 4ea7ea065d70 -r 8817f62abd8a sql/updates/mysql_1.5.2_to_1.6.0.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/updates/mysql_1.5.2_to_1.6.0.php Tue Jan 06 16:27:45 2009 +0100
@@ -0,0 +1,17 @@
+<?php
+
+function update_ConfValues()
+{
+ global $_CONF;
+
+ require_once $_CONF['path_system'] . 'classes/config.class.php';
+
+ $c = config::get_instance();
+
+ // new option
+ $c->add('jpeg_quality',75,'text',5,23,NULL,1495,FALSE);
+
+ return true;
+}
+
+?>
More information about the geeklog-cvs
mailing list