[geeklog-cvs] geeklog: This version will be called 1.6.0. Version 1.5.2 from b...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Mon Jan 5 05:06:15 EST 2009
details: http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/c4c31b02807d
changeset: 6593:c4c31b02807d
user: Dirk Haun <dirk at haun-online.de>
date: Fri Dec 26 12:21:20 2008 +0100
description:
This version will be called 1.6.0. Version 1.5.2 from branch to be added later
diffstat:
9 files changed, 95 insertions(+), 91 deletions(-)
public_html/admin/install/index.php | 8 ++++-
public_html/admin/install/lib-install.php | 2 -
public_html/siteconfig.php.dist | 2 -
sql/mssql_tableanddata.php | 2 -
sql/mysql_tableanddata.php | 2 -
sql/updates/mssql_1.5.1_to_1.5.2.php | 42 ----------------------------
sql/updates/mssql_1.5.1_to_1.6.0.php | 42 ++++++++++++++++++++++++++++
sql/updates/mysql_1.5.1_to_1.5.2.php | 43 -----------------------------
sql/updates/mysql_1.5.1_to_1.6.0.php | 43 +++++++++++++++++++++++++++++
diffs (266 lines):
diff -r e403a16fe4ca -r c4c31b02807d public_html/admin/install/index.php
--- a/public_html/admin/install/index.php Fri Dec 26 12:00:01 2008 +0100
+++ b/public_html/admin/install/index.php Fri Dec 26 12:21:20 2008 +0100
@@ -481,6 +481,9 @@
if (!empty($lng)) {
$config->set('language', $lng);
}
+
+ DB_change($_TABLES['vars'], 'value', VERSION,
+ 'name', 'database_version');
if (! $install_plugins) {
// do a default install of all available plugins
@@ -1375,7 +1378,8 @@
break;
case '1.5.1':
- require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.5.1_to_1.5.2.php';
+ case '1.5.2': // TBD
+ require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.5.1_to_1.6.0.php';
update_ConfValues();
@@ -1387,7 +1391,7 @@
}
}
- $current_gl_version = '1.5.2';
+ $current_gl_version = '1.6.0';
$_SQL = '';
break;
diff -r e403a16fe4ca -r c4c31b02807d public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php Fri Dec 26 12:00:01 2008 +0100
+++ b/public_html/admin/install/lib-install.php Fri Dec 26 12:21:20 2008 +0100
@@ -51,7 +51,7 @@
define('LB', "\n");
}
if (!defined('VERSION')) {
- define('VERSION', '1.5.2');
+ define('VERSION', '1.6.0');
}
if (!defined('XHTML')) {
define('XHTML', ' /');
diff -r e403a16fe4ca -r c4c31b02807d public_html/siteconfig.php.dist
--- a/public_html/siteconfig.php.dist Fri Dec 26 12:00:01 2008 +0100
+++ b/public_html/siteconfig.php.dist Fri Dec 26 12:21:20 2008 +0100
@@ -38,7 +38,7 @@
define('LB',"\n");
}
if (!defined('VERSION')) {
- define('VERSION', '1.5.2hg');
+ define('VERSION', '1.6.0hg');
}
?>
diff -r e403a16fe4ca -r c4c31b02807d sql/mssql_tableanddata.php
--- a/sql/mssql_tableanddata.php Fri Dec 26 12:00:01 2008 +0100
+++ b/sql/mssql_tableanddata.php Fri Dec 26 12:21:20 2008 +0100
@@ -1379,7 +1379,7 @@
$_SQL[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('totalhits','0')";
$_SQL[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('lastemailedstories','')";
$_SQL[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('last_scheduled_run','')";
-$_SQL[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('database_version','1.5.2')";
+$_SQL[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('database_version','0.0.0')";
$_SQL[] = "INSERT INTO {$_TABLES['trackbackcodes']} (code, name) VALUES (0,'Trackback Enabled')";
$_SQL[] = "INSERT INTO {$_TABLES['trackbackcodes']} (code, name) VALUES (-1,'Trackback Disabled')";
diff -r e403a16fe4ca -r c4c31b02807d sql/mysql_tableanddata.php
--- a/sql/mysql_tableanddata.php Fri Dec 26 12:00:01 2008 +0100
+++ b/sql/mysql_tableanddata.php Fri Dec 26 12:21:20 2008 +0100
@@ -667,7 +667,7 @@
$_DATA[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('totalhits','0') ";
$_DATA[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('lastemailedstories','') ";
$_DATA[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('last_scheduled_run','') ";
-$_DATA[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('database_version','1.5.2') ";
+$_DATA[] = "INSERT INTO {$_TABLES['vars']} (name, value) VALUES ('database_version','0.0.0') ";
$_DATA[] = "INSERT INTO {$_TABLES['trackbackcodes']} (code, name) VALUES (0,'Trackback Enabled') ";
$_DATA[] = "INSERT INTO {$_TABLES['trackbackcodes']} (code, name) VALUES (-1,'Trackback Disabled') ";
diff -r e403a16fe4ca -r c4c31b02807d sql/updates/mssql_1.5.1_to_1.5.2.php
--- a/sql/updates/mssql_1.5.1_to_1.5.2.php Fri Dec 26 12:00:01 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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);
-
- if (INST_pluginExists('links')) {
- $c->add('new_window',false,'select',0,0,1,55,TRUE,'links');
- }
-
- return true;
-}
-
-function upgrade_PollsPluginId()
-{
- global $_TABLES;
-
- $P_SQL = array();
- $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ALTER COLUMN [pid] VARCHARS(40)";
- $P_SQL[] = "ALTER TABLE {$_TABLES['pollquestions']} ALTER COLUMN [pid] VARCHARS(40)";
- $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ALTER COLUMN [pid] VARCHARS(40)";
- $P_SQL[] = "ALTER TABLE {$_TABLES['pollvoters']} ALTER COLUMN [pid] VARCHARS(40)";
-
- foreach ($P_SQL as $sql) {
- $rst = DB_query($sql);
- if (DB_error()) {
- echo "There was an error upgrading the polls, SQL: $sql<br>";
- return false;
- }
- }
-
- return true;
-}
-
-?>
diff -r e403a16fe4ca -r c4c31b02807d sql/updates/mssql_1.5.1_to_1.6.0.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/updates/mssql_1.5.1_to_1.6.0.php Fri Dec 26 12:21:20 2008 +0100
@@ -0,0 +1,42 @@
+<?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);
+
+ if (INST_pluginExists('links')) {
+ $c->add('new_window',false,'select',0,0,1,55,TRUE,'links');
+ }
+
+ return true;
+}
+
+function upgrade_PollsPluginId()
+{
+ global $_TABLES;
+
+ $P_SQL = array();
+ $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} ALTER COLUMN [pid] VARCHARS(40)";
+ $P_SQL[] = "ALTER TABLE {$_TABLES['pollquestions']} ALTER COLUMN [pid] VARCHARS(40)";
+ $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} ALTER COLUMN [pid] VARCHARS(40)";
+ $P_SQL[] = "ALTER TABLE {$_TABLES['pollvoters']} ALTER COLUMN [pid] VARCHARS(40)";
+
+ foreach ($P_SQL as $sql) {
+ $rst = DB_query($sql);
+ if (DB_error()) {
+ echo "There was an error upgrading the polls, SQL: $sql<br>";
+ return false;
+ }
+ }
+
+ return true;
+}
+
+?>
diff -r e403a16fe4ca -r c4c31b02807d sql/updates/mysql_1.5.1_to_1.5.2.php
--- a/sql/updates/mysql_1.5.1_to_1.5.2.php Fri Dec 26 12:00:01 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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);
-
- if (INST_pluginExists('links')) {
- $c->add('new_window',false,'select',0,0,1,55,TRUE,'links');
- }
-
- return true;
-}
-
-function upgrade_PollsPluginId()
-{
- global $_TABLES;
-
- $P_SQL = array();
- $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} CHANGE pid pid varchar(40) NOT NULL default ''";
- $P_SQL[] = "ALTER TABLE {$_TABLES['pollquestions']} CHANGE pid pid varchar(40) NOT NULL default ''";
- $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} CHANGE pid pid varchar(40) NOT NULL default ''";
- $P_SQL[] = "ALTER TABLE {$_TABLES['pollvoters']} CHANGE pid pid varchar(40) NOT NULL default ''";
-
- $P_SQL = INST_checkInnodbUpgrade($P_SQL);
- foreach ($P_SQL as $sql) {
- $rst = DB_query($sql);
- if (DB_error()) {
- echo "There was an error upgrading the polls, SQL: $sql<br>";
- return false;
- }
- }
-
- return true;
-}
-
-?>
diff -r e403a16fe4ca -r c4c31b02807d sql/updates/mysql_1.5.1_to_1.6.0.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/updates/mysql_1.5.1_to_1.6.0.php Fri Dec 26 12:21:20 2008 +0100
@@ -0,0 +1,43 @@
+<?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);
+
+ if (INST_pluginExists('links')) {
+ $c->add('new_window',false,'select',0,0,1,55,TRUE,'links');
+ }
+
+ return true;
+}
+
+function upgrade_PollsPluginId()
+{
+ global $_TABLES;
+
+ $P_SQL = array();
+ $P_SQL[] = "ALTER TABLE {$_TABLES['pollanswers']} CHANGE pid pid varchar(40) NOT NULL default ''";
+ $P_SQL[] = "ALTER TABLE {$_TABLES['pollquestions']} CHANGE pid pid varchar(40) NOT NULL default ''";
+ $P_SQL[] = "ALTER TABLE {$_TABLES['polltopics']} CHANGE pid pid varchar(40) NOT NULL default ''";
+ $P_SQL[] = "ALTER TABLE {$_TABLES['pollvoters']} CHANGE pid pid varchar(40) NOT NULL default ''";
+
+ $P_SQL = INST_checkInnodbUpgrade($P_SQL);
+ foreach ($P_SQL as $sql) {
+ $rst = DB_query($sql);
+ if (DB_error()) {
+ echo "There was an error upgrading the polls, SQL: $sql<br>";
+ return false;
+ }
+ }
+
+ return true;
+}
+
+?>
More information about the geeklog-cvs
mailing list