[geeklog-cvs] geeklog: 1.6.2 -> 1.7.0
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sat Mar 27 11:23:20 EDT 2010
changeset 7846:c03516c87845
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/c03516c87845
user: Dirk Haun <dirk at haun-online.de>
date: Sat Mar 27 16:13:34 2010 +0100
description:
1.6.2 -> 1.7.0
diffstat:
public_html/admin/install/lib-install.php | 4 +-
public_html/admin/install/lib-upgrade.php | 10 ++--
public_html/docs/english/theme.html | 2 +-
public_html/docs/history | 2 +-
public_html/siteconfig.php.dist | 2 +-
sql/updates/mssql_1.6.1_to_1.6.2.php | 56 ----------------------------
sql/updates/mssql_1.6.1_to_1.7.0.php | 56 ++++++++++++++++++++++++++++
sql/updates/mysql_1.6.1_to_1.6.2.php | 56 ----------------------------
sql/updates/mysql_1.6.1_to_1.7.0.php | 56 ++++++++++++++++++++++++++++
9 files changed, 122 insertions(+), 122 deletions(-)
diffs (truncated from 331 to 300 lines):
diff -r c9bd05aadd72 -r c03516c87845 public_html/admin/install/lib-install.php
--- a/public_html/admin/install/lib-install.php Sat Mar 27 16:07:22 2010 +0100
+++ b/public_html/admin/install/lib-install.php Sat Mar 27 16:13:34 2010 +0100
@@ -2,7 +2,7 @@
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
-// | Geeklog 1.6 |
+// | Geeklog 1.7 |
// +---------------------------------------------------------------------------+
// | lib-install.php |
// | |
@@ -56,7 +56,7 @@
* This constant defines Geeklog's version number. It will be written to
* siteconfig.php and the database (in the latter case minus any suffix).
*/
- define('VERSION', '1.6.2hg');
+ define('VERSION', '1.7.0hg');
}
if (!defined('XHTML')) {
define('XHTML', ' /');
diff -r c9bd05aadd72 -r c03516c87845 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php Sat Mar 27 16:07:22 2010 +0100
+++ b/public_html/admin/install/lib-upgrade.php Sat Mar 27 16:13:34 2010 +0100
@@ -2,13 +2,13 @@
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
-// | Geeklog 1.6 |
+// | Geeklog 1.7 |
// +---------------------------------------------------------------------------+
// | lib-upgrade.php |
// | |
// | Functions needed to perform a database update. |
// +---------------------------------------------------------------------------+
-// | Copyright (C) 2000-2009 by the following authors: |
+// | Copyright (C) 2000-2010 by the following authors: |
// | |
// | Authors: Matt West - matt.danger.west AT gmail DOT com |
// | Dirk Haun - dirk AT haun-online DOT de |
@@ -485,12 +485,12 @@
break;
case '1.6.1':
- require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.6.1_to_1.6.2.php';
+ require_once $_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.6.1_to_1.7.0.php';
INST_updateDB($_SQL);
- update_ConfValuesFor162();
+ update_ConfValuesFor170();
- $current_gl_version = '1.6.2';
+ $current_gl_version = '1.7.0';
$_SQL = '';
break;
diff -r c9bd05aadd72 -r c03516c87845 public_html/docs/english/theme.html
--- a/public_html/docs/english/theme.html Sat Mar 27 16:07:22 2010 +0100
+++ b/public_html/docs/english/theme.html Sat Mar 27 16:13:34 2010 +0100
@@ -201,7 +201,7 @@
</ol>
-<h2><a name="changes">Theme changes in Geeklog 1.6.2</a></h2>
+<h2><a name="changes">Theme changes in Geeklog 1.7.0</a></h2>
<ul>
<li>Added a hidden field "<tt>old_tid</tt>" to the topic editor template file,
diff -r c9bd05aadd72 -r c03516c87845 public_html/docs/history
--- a/public_html/docs/history Sat Mar 27 16:07:22 2010 +0100
+++ b/public_html/docs/history Sat Mar 27 16:13:34 2010 +0100
@@ -1,6 +1,6 @@
Geeklog History/Changes:
-Apr ??, 2010 (1.6.2)
+Apr ??, 2010 (1.7.0)
------------
- Raised minimum required PHP version to PHP 4.4.0 [Dirk]
diff -r c9bd05aadd72 -r c03516c87845 public_html/siteconfig.php.dist
--- a/public_html/siteconfig.php.dist Sat Mar 27 16:07:22 2010 +0100
+++ b/public_html/siteconfig.php.dist Sat Mar 27 16:13:34 2010 +0100
@@ -38,7 +38,7 @@
define('LB',"\n");
}
if (!defined('VERSION')) {
- define('VERSION', '1.6.2');
+ define('VERSION', '1.7.0');
}
?>
diff -r c9bd05aadd72 -r c03516c87845 sql/updates/mssql_1.6.1_to_1.6.2.php
--- a/sql/updates/mssql_1.6.1_to_1.6.2.php Sat Mar 27 16:07:22 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-<?php
-
-// make $_CONF['menu_elements'] and $_CONF['notification'] arrays of dropdowns
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = '%select', selectionArray = 24 WHERE name = 'menu_elements' AND group_name = 'Core'";
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = '%select', selectionArray = 25 WHERE name = 'notification' AND group_name = 'Core'";
-
-// make $_CONF['default_perm_cookie_timeout'] option a dropdown
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'select' WHERE name = 'default_perm_cookie_timeout' AND group_name = 'Core'";
-
-// make $_CONF['gravatar_rating'] option a dropdown
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'select', selectionArray = 26 WHERE name = 'gravatar_rating' AND group_name = 'Core'";
-
-// change some config options to use a textarea instead of a one-line text field
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'textarea' WHERE name = 'site_disabled_msg' AND group_name = 'Core'";
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'textarea' WHERE name = 'meta_description' AND group_name = 'Core'";
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'textarea' WHERE name = 'meta_keywords' AND group_name = 'Core'";
-
-// make room to store IPv6 addresses
-$_SQL[] = "ALTER TABLE {$_TABLES['comments']} ALTER COLUMN [ipaddress] varchar(39) NOT NULL";
-$_SQL[] = "ALTER TABLE {$_TABLES['commentsubmissions']} ALTER COLUMN [ipaddress] varchar(39) NOT NULL";
-$_SQL[] = "ALTER TABLE {$_TABLES['sessions']} ALTER COLUMN [remote_ip] varchar(39) NOT NULL";
-$_SQL[] = "ALTER TABLE {$_TABLES['speedlimit']} ALTER COLUMN [ipaddress] varchar(39) NOT NULL";
-$_SQL[] = "ALTER TABLE {$_TABLES['trackback']} ALTER COLUMN [ipaddress] varchar(39) NOT NULL";
-
-// new "Default Group" flag
-$_SQL[] = "ALTER TABLE {$_TABLES['groups']} ADD [grp_default] [tinyint] NOT NULL";
-
-// allow users to choose whether they want to use the Advanced Editor or not
-$_SQL[] = "ALTER TABLE {$_TABLES['userprefs']} ADD [advanced_editor] [tinyint] NOT NULL";
-$_SQL[] = "UPDATE {$_TABLES['userprefs']} SET advanced_editor = 0 WHERE uid = 1";
-
-// Insert Group right to allow skipping of the HTML filter
-$_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('htmlfilter.skip', 'Skip filtering posts for HTML', 1)";
-
-// new alternative page title for stories
-$_SQL[] = "ALTER TABLE {$_TABLES['stories']} ADD [page_title] [varchar] (128) NULL";
-
-/**
- * Add new config options
- *
- */
-function update_ConfValuesFor162()
-{
- global $_CONF, $_TABLES;
-
- require_once $_CONF['path_system'] . 'classes/config.class.php';
-
- $c = config::get_instance();
-
- // search config options.
- $c->add('search_def_sort','hits|desc','select',0,6,27,676,TRUE);
-
- return true;
-}
-
-?>
diff -r c9bd05aadd72 -r c03516c87845 sql/updates/mssql_1.6.1_to_1.7.0.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/updates/mssql_1.6.1_to_1.7.0.php Sat Mar 27 16:13:34 2010 +0100
@@ -0,0 +1,56 @@
+<?php
+
+// make $_CONF['menu_elements'] and $_CONF['notification'] arrays of dropdowns
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = '%select', selectionArray = 24 WHERE name = 'menu_elements' AND group_name = 'Core'";
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = '%select', selectionArray = 25 WHERE name = 'notification' AND group_name = 'Core'";
+
+// make $_CONF['default_perm_cookie_timeout'] option a dropdown
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'select' WHERE name = 'default_perm_cookie_timeout' AND group_name = 'Core'";
+
+// make $_CONF['gravatar_rating'] option a dropdown
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'select', selectionArray = 26 WHERE name = 'gravatar_rating' AND group_name = 'Core'";
+
+// change some config options to use a textarea instead of a one-line text field
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'textarea' WHERE name = 'site_disabled_msg' AND group_name = 'Core'";
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'textarea' WHERE name = 'meta_description' AND group_name = 'Core'";
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'textarea' WHERE name = 'meta_keywords' AND group_name = 'Core'";
+
+// make room to store IPv6 addresses
+$_SQL[] = "ALTER TABLE {$_TABLES['comments']} ALTER COLUMN [ipaddress] varchar(39) NOT NULL";
+$_SQL[] = "ALTER TABLE {$_TABLES['commentsubmissions']} ALTER COLUMN [ipaddress] varchar(39) NOT NULL";
+$_SQL[] = "ALTER TABLE {$_TABLES['sessions']} ALTER COLUMN [remote_ip] varchar(39) NOT NULL";
+$_SQL[] = "ALTER TABLE {$_TABLES['speedlimit']} ALTER COLUMN [ipaddress] varchar(39) NOT NULL";
+$_SQL[] = "ALTER TABLE {$_TABLES['trackback']} ALTER COLUMN [ipaddress] varchar(39) NOT NULL";
+
+// new "Default Group" flag
+$_SQL[] = "ALTER TABLE {$_TABLES['groups']} ADD [grp_default] [tinyint] NOT NULL";
+
+// allow users to choose whether they want to use the Advanced Editor or not
+$_SQL[] = "ALTER TABLE {$_TABLES['userprefs']} ADD [advanced_editor] [tinyint] NOT NULL";
+$_SQL[] = "UPDATE {$_TABLES['userprefs']} SET advanced_editor = 0 WHERE uid = 1";
+
+// Insert Group right to allow skipping of the HTML filter
+$_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('htmlfilter.skip', 'Skip filtering posts for HTML', 1)";
+
+// new alternative page title for stories
+$_SQL[] = "ALTER TABLE {$_TABLES['stories']} ADD [page_title] [varchar] (128) NULL";
+
+/**
+ * Add new config options
+ *
+ */
+function update_ConfValuesFor170()
+{
+ global $_CONF, $_TABLES;
+
+ require_once $_CONF['path_system'] . 'classes/config.class.php';
+
+ $c = config::get_instance();
+
+ // search config options.
+ $c->add('search_def_sort','hits|desc','select',0,6,27,676,TRUE);
+
+ return true;
+}
+
+?>
diff -r c9bd05aadd72 -r c03516c87845 sql/updates/mysql_1.6.1_to_1.6.2.php
--- a/sql/updates/mysql_1.6.1_to_1.6.2.php Sat Mar 27 16:07:22 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-<?php
-
-// make $_CONF['menu_elements'] and $_CONF['notification'] arrays of dropdowns
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = '%select', selectionArray = 24 WHERE name = 'menu_elements' AND group_name = 'Core'";
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = '%select', selectionArray = 25 WHERE name = 'notification' AND group_name = 'Core'";
-
-// make $_CONF['default_perm_cookie_timeout'] option a dropdown
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'select' WHERE name = 'default_perm_cookie_timeout' AND group_name = 'Core'";
-
-// make $_CONF['gravatar_rating'] option a dropdown
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'select', selectionArray = 26 WHERE name = 'gravatar_rating' AND group_name = 'Core'";
-
-// change some config options to use a textarea instead of a one-line text field
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'textarea' WHERE name = 'site_disabled_msg' AND group_name = 'Core'";
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'textarea' WHERE name = 'meta_description' AND group_name = 'Core'";
-$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'textarea' WHERE name = 'meta_keywords' AND group_name = 'Core'";
-
-// make room to store IPv6 addresses
-$_SQL[] = "ALTER TABLE {$_TABLES['comments']} CHANGE ipaddress ipaddress varchar(39) NOT NULL default ''";
-$_SQL[] = "ALTER TABLE {$_TABLES['commentsubmissions']} CHANGE ipaddress ipaddress varchar(39) NOT NULL default ''";
-$_SQL[] = "ALTER TABLE {$_TABLES['sessions']} CHANGE remote_ip remote_ip varchar(39) NOT NULL default ''";
-$_SQL[] = "ALTER TABLE {$_TABLES['speedlimit']} CHANGE ipaddress ipaddress varchar(39) NOT NULL default ''";
-$_SQL[] = "ALTER TABLE {$_TABLES['trackback']} CHANGE ipaddress ipaddress varchar(39) NOT NULL default ''";
-
-// new "Default Group" flag
-$_SQL[] = "ALTER TABLE {$_TABLES['groups']} ADD grp_default tinyint(1) unsigned NOT NULL default '0' AFTER grp_gl_core";
-
-// allow users to choose whether they want to use the Advanced Editor or not
-$_SQL[] = "ALTER TABLE {$_TABLES['userprefs']} ADD advanced_editor tinyint(1) unsigned NOT NULL default '1' AFTER dfid";
-$_SQL[] = "UPDATE {$_TABLES['userprefs']} SET advanced_editor = 0 WHERE uid = 1";
-
-// Insert Group right to allow skipping of the HTML filter
-$_SQL[] = "INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('htmlfilter.skip', 'Skip filtering posts for HTML', 1)";
-
-// new alternative page title for stories
-$_SQL[] = "ALTER TABLE {$_TABLES['stories']} ADD page_title varchar(128) default NULL AFTER title";
-
-/**
- * Add new config options
- *
- */
-function update_ConfValuesFor162()
-{
- global $_CONF, $_TABLES;
-
- require_once $_CONF['path_system'] . 'classes/config.class.php';
-
- $c = config::get_instance();
-
- // search config options.
- $c->add('search_def_sort','hits|desc','select',0,6,27,676,TRUE);
-
- return true;
-}
-
-?>
diff -r c9bd05aadd72 -r c03516c87845 sql/updates/mysql_1.6.1_to_1.7.0.php
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/updates/mysql_1.6.1_to_1.7.0.php Sat Mar 27 16:13:34 2010 +0100
@@ -0,0 +1,56 @@
+<?php
+
+// make $_CONF['menu_elements'] and $_CONF['notification'] arrays of dropdowns
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = '%select', selectionArray = 24 WHERE name = 'menu_elements' AND group_name = 'Core'";
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = '%select', selectionArray = 25 WHERE name = 'notification' AND group_name = 'Core'";
+
+// make $_CONF['default_perm_cookie_timeout'] option a dropdown
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'select' WHERE name = 'default_perm_cookie_timeout' AND group_name = 'Core'";
+
+// make $_CONF['gravatar_rating'] option a dropdown
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'select', selectionArray = 26 WHERE name = 'gravatar_rating' AND group_name = 'Core'";
+
+// change some config options to use a textarea instead of a one-line text field
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'textarea' WHERE name = 'site_disabled_msg' AND group_name = 'Core'";
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'textarea' WHERE name = 'meta_description' AND group_name = 'Core'";
+$_SQL[] = "UPDATE {$_TABLES['conf_values']} SET type = 'textarea' WHERE name = 'meta_keywords' AND group_name = 'Core'";
+
+// make room to store IPv6 addresses
+$_SQL[] = "ALTER TABLE {$_TABLES['comments']} CHANGE ipaddress ipaddress varchar(39) NOT NULL default ''";
+$_SQL[] = "ALTER TABLE {$_TABLES['commentsubmissions']} CHANGE ipaddress ipaddress varchar(39) NOT NULL default ''";
+$_SQL[] = "ALTER TABLE {$_TABLES['sessions']} CHANGE remote_ip remote_ip varchar(39) NOT NULL default ''";
+$_SQL[] = "ALTER TABLE {$_TABLES['speedlimit']} CHANGE ipaddress ipaddress varchar(39) NOT NULL default ''";
+$_SQL[] = "ALTER TABLE {$_TABLES['trackback']} CHANGE ipaddress ipaddress varchar(39) NOT NULL default ''";
+
+// new "Default Group" flag
More information about the geeklog-cvs
mailing list