[geeklog-cvs] geeklog: Merged with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Wed Mar 14 19:57:14 EDT 2012
changeset 8538:93121cbd9f23
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/93121cbd9f23
user: Rouslan Placella <rouslan at placella.com>
date: Wed Mar 14 23:56:35 2012 +0000
description:
Merged with upstream
diffstat:
plugins/calendar/functions.inc | 13 ++++++++---
plugins/calendar/language/english.php | 2 +-
plugins/calendar/language/english_utf-8.php | 2 +-
plugins/calendar/sql/mssql_updates.php | 2 -
plugins/calendar/sql/mysql_updates.php | 2 -
plugins/calendar/sql/pgsql_updates.php | 2 -
plugins/links/functions.inc | 31 +++++++++++++++++-----------
plugins/links/sql/mssql_updates.php | 2 -
plugins/links/sql/mysql_updates.php | 2 -
plugins/links/sql/pgsql_updates.php | 2 -
plugins/polls/functions.inc | 13 ++++++++---
plugins/polls/language/english.php | 2 +-
plugins/polls/language/english_utf-8.php | 2 +-
plugins/polls/sql/mssql_updates.php | 2 -
plugins/polls/sql/mysql_updates.php | 2 -
plugins/polls/sql/pgsql_updates.php | 2 -
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 -
20 files changed, 50 insertions(+), 52 deletions(-)
diffs (truncated from 342 to 300 lines):
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/calendar/functions.inc Wed Mar 14 23:56:35 2012 +0000
@@ -1587,10 +1587,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 = 'calendar'";
+ DB_query($sql);
+
calendar_update_ConfValues_1_1_1();
-
- calendar_update_ConfigSecurity_1_1_1();
}
+
+ calendar_update_ConfigSecurity_1_1_1();
$current_version = '1.1.2';
break;
@@ -1605,9 +1610,9 @@
if (! $current_config) {
calendar_update_ConfValues_1_1_2();
+ }
- calendar_update_ConfigSecurity_1_1_2();
- }
+ calendar_update_ConfigSecurity_1_1_2();
$current_version = '1.1.3';
break;
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/calendar/language/english.php
--- a/plugins/calendar/language/english.php Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/calendar/language/english.php Wed Mar 14 23:56:35 2012 +0000
@@ -251,7 +251,7 @@
14 => array('No access' => 0, 'Read-Only' => 2),
15 => SEC_getUserGroups(),
16 => array('All' => TOPIC_ALL_OPTION, 'Homepage Only' => TOPIC_HOMEONLY_OPTION, 'Select Topics' => TOPIC_SELECTED_OPTION),
- 17 => TOPIC_getList()
+ 17 => array_flip(TOPIC_getList())
);
?>
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/calendar/language/english_utf-8.php
--- a/plugins/calendar/language/english_utf-8.php Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/calendar/language/english_utf-8.php Wed Mar 14 23:56:35 2012 +0000
@@ -251,7 +251,7 @@
14 => array('No access' => 0, 'Read-Only' => 2),
15 => SEC_getUserGroups(),
16 => array('All' => TOPIC_ALL_OPTION, 'Homepage Only' => TOPIC_HOMEONLY_OPTION, 'Select Topics' => TOPIC_SELECTED_OPTION),
- 17 => TOPIC_getList()
+ 17 => array_flip(TOPIC_getList())
);
?>
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/calendar/sql/mssql_updates.php
--- a/plugins/calendar/sql/mssql_updates.php Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/calendar/sql/mssql_updates.php Wed Mar 14 23:56:35 2012 +0000
@@ -45,8 +45,6 @@
),
'1.1.1' => array(
- // Set new Tab column to whatever fieldset is
- "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'calendar'",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_main', 'Access to configure general calendar settings', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_permissions', 'Access to configure event default permissions', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_autotag_permissions', 'Access to configure event autotag usage permissions', 0)"
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/calendar/sql/mysql_updates.php
--- a/plugins/calendar/sql/mysql_updates.php Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/calendar/sql/mysql_updates.php Wed Mar 14 23:56:35 2012 +0000
@@ -45,8 +45,6 @@
),
'1.1.1' => array(
- // Set new Tab column to whatever fieldset is
- "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'calendar'",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_main', 'Access to configure general calendar settings', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_permissions', 'Access to configure event default permissions', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_autotag_permissions', 'Access to configure event autotag usage permissions', 0)"
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/calendar/sql/pgsql_updates.php
--- a/plugins/calendar/sql/pgsql_updates.php Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/calendar/sql/pgsql_updates.php Wed Mar 14 23:56:35 2012 +0000
@@ -35,8 +35,6 @@
$_UPDATES = array(
'1.1.1' => array(
- // Set new Tab column to whatever fieldset is
- "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'calendar'",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_main', 'Access to configure general calendar settings', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_permissions', 'Access to configure event default permissions', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.calendar.tab_autotag_permissions', 'Access to configure event autotag usage permissions', 0)"
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/links/functions.inc
--- a/plugins/links/functions.inc Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/links/functions.inc Wed Mar 14 23:56:35 2012 +0000
@@ -736,16 +736,18 @@
break;
case '2.0.1': // Last version of old install (Geeklog 1.5.2)
- if (! isset($_LI_CONF['new_window'])) {
- $c = config::get_instance();
- $c->add('new_window',false,'select',0,0,1,55,TRUE,'links');
- }
-
- if (! isset($_LI_CONF['category_permissions'])) {
- $c = config::get_instance();
- $c->add('fs_cpermissions', NULL, 'fieldset', 0, 3, NULL, 0, true, 'links');
- $c->add('category_permissions', array (3, 2, 2, 2),
- '@select', 0, 3, 12, 150, true, 'links');
+ if (! $current_config) {
+ if (! isset($_LI_CONF['new_window'])) {
+ $c = config::get_instance();
+ $c->add('new_window',false,'select',0,0,1,55,TRUE,'links');
+ }
+
+ if (! isset($_LI_CONF['category_permissions'])) {
+ $c = config::get_instance();
+ $c->add('fs_cpermissions', NULL, 'fieldset', 0, 3, NULL, 0, true, 'links');
+ $c->add('category_permissions', array (3, 2, 2, 2),
+ '@select', 0, 3, 12, 150, true, 'links');
+ }
}
$current_version = '2.1.0';
@@ -760,10 +762,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 = 'links'";
+ DB_query($sql);
+
links_update_ConfValues_2_1_0();
-
- links_update_ConfigSecurity_2_1_0();
}
+
+ links_update_ConfigSecurity_2_1_0();
$current_version = '2.1.1';
break;
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/links/sql/mssql_updates.php
--- a/plugins/links/sql/mssql_updates.php Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/links/sql/mssql_updates.php Wed Mar 14 23:56:35 2012 +0000
@@ -68,8 +68,6 @@
),
'2.1.0' => array(
- // Set new Tab column to whatever fieldset is
- "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'links'",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.links.tab_public', 'Access to configure public links list settings', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.links.tab_admin', 'Access to configure links admin settings', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.links.tab_permissions', 'Access to configure link permissions', 0)",
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/links/sql/mysql_updates.php
--- a/plugins/links/sql/mysql_updates.php Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/links/sql/mysql_updates.php Wed Mar 14 23:56:35 2012 +0000
@@ -63,8 +63,6 @@
),
'2.1.0' => array(
- // Set new Tab column to whatever fieldset is
- "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'links'",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.links.tab_public', 'Access to configure public links list settings', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.links.tab_admin', 'Access to configure links admin settings', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.links.tab_permissions', 'Access to configure link permissions', 0)",
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/links/sql/pgsql_updates.php
--- a/plugins/links/sql/pgsql_updates.php Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/links/sql/pgsql_updates.php Wed Mar 14 23:56:35 2012 +0000
@@ -40,8 +40,6 @@
$_UPDATES = array(
'2.1.0' => array(
- // Set new Tab column to whatever fieldset is
- "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'links'",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.links.tab_public', 'Access to configure public links list settings', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.links.tab_admin', 'Access to configure links admin settings', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.links.tab_permissions', 'Access to configure link permissions', 0)",
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/polls/functions.inc
--- a/plugins/polls/functions.inc Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/polls/functions.inc Wed Mar 14 23:56:35 2012 +0000
@@ -1238,10 +1238,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 = 'polls'";
+ DB_query($sql);
+
polls_update_ConfValues_2_1_2();
+ }
- polls_update_ConfigSecurity_2_1_2();
- }
+ polls_update_ConfigSecurity_2_1_2();
$current_version = '2.1.3';
break;
@@ -1256,9 +1261,9 @@
if (! $current_config) {
polls_update_ConfValues_2_1_3();
-
- polls_update_ConfigSecurity_2_1_3();
}
+
+ polls_update_ConfigSecurity_2_1_3();
$current_version = '2.1.4';
break;
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/polls/language/english.php
--- a/plugins/polls/language/english.php Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/polls/language/english.php Wed Mar 14 23:56:35 2012 +0000
@@ -183,7 +183,7 @@
14 => array('No access' => 0, 'Read-Only' => 2),
15 => SEC_getUserGroups(),
16 => array('All' => TOPIC_ALL_OPTION, 'Homepage Only' => TOPIC_HOMEONLY_OPTION, 'Select Topics' => TOPIC_SELECTED_OPTION),
- 17 => TOPIC_getList()
+ 17 => array_flip(TOPIC_getList())
);
?>
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/polls/language/english_utf-8.php
--- a/plugins/polls/language/english_utf-8.php Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/polls/language/english_utf-8.php Wed Mar 14 23:56:35 2012 +0000
@@ -183,7 +183,7 @@
14 => array('No access' => 0, 'Read-Only' => 2),
15 => SEC_getUserGroups(),
16 => array('All' => TOPIC_ALL_OPTION, 'Homepage Only' => TOPIC_HOMEONLY_OPTION, 'Select Topics' => TOPIC_SELECTED_OPTION),
- 17 => TOPIC_getList()
+ 17 => array_flip(TOPIC_getList())
);
?>
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/polls/sql/mssql_updates.php
--- a/plugins/polls/sql/mssql_updates.php Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/polls/sql/mssql_updates.php Wed Mar 14 23:56:35 2012 +0000
@@ -85,8 +85,6 @@
),
'2.1.2' => array(
- // Set new Tab column to whatever fieldset is
- "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'polls'",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_whatsnew', 'Access to configure polls what\'s new block', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_main', 'Access to configure general polls settings', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_permissions', 'Access to configure polls default permissions', 0)",
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/polls/sql/mysql_updates.php
--- a/plugins/polls/sql/mysql_updates.php Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/polls/sql/mysql_updates.php Wed Mar 14 23:56:35 2012 +0000
@@ -79,8 +79,6 @@
),
'2.1.2' => array(
- // Set new Tab column to whatever fieldset is
- "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'polls'",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_whatsnew', 'Access to configure polls what\'s new block', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_main', 'Access to configure general polls settings', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_permissions', 'Access to configure polls default permissions', 0)",
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/polls/sql/pgsql_updates.php
--- a/plugins/polls/sql/pgsql_updates.php Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/polls/sql/pgsql_updates.php Wed Mar 14 23:56:35 2012 +0000
@@ -35,8 +35,6 @@
$_UPDATES = array(
'2.1.2' => array(
- // Set new Tab column to whatever fieldset is
- "UPDATE {$_TABLES['conf_values']} SET tab = fieldset WHERE group_name = 'polls'",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_whatsnew', 'Access to configure polls what\'s new block', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_main', 'Access to configure general polls settings', 0)",
"INSERT INTO {$_TABLES['features']} (ft_name, ft_descr, ft_gl_core) VALUES ('config.polls.tab_permissions', 'Access to configure polls default permissions', 0)",
diff -r 7b82440eaeae -r 93121cbd9f23 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc Wed Mar 14 23:55:52 2012 +0000
+++ b/plugins/staticpages/functions.inc Wed Mar 14 23:56:35 2012 +0000
@@ -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();
}
More information about the geeklog-cvs
mailing list