From 7d4a25e73f2135fec1ff00180c34d4cf766617f7 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 3 Nov 2009 14:40:25 +0000 Subject: [PATCH 01/16] Fix Bug #53505 (related to Bug #52515 and r10208) - i fixed this the "do not break other things" way, usually the fix would be using !$submit here git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10251 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/ucp/ucp_pm_compose.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 2f56bcdf7a..d9e3deaa41 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -811,7 +811,7 @@ function compose_pm($id, $mode, $action) } // Decode text for message display - $bbcode_uid = (($action == 'quote' || $action == 'forward') && !$preview && !$refresh) ? $bbcode_uid : $message_parser->bbcode_uid; + $bbcode_uid = (($action == 'quote' || $action == 'forward') && !$preview && !$refresh && (!sizeof($error) || (sizeof($error) && !$submit))) ? $bbcode_uid : $message_parser->bbcode_uid; $message_parser->decode_message($bbcode_uid); From b8cac003660894a3000430ab0004ec7d1fd55bdf Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 3 Nov 2009 14:51:07 +0000 Subject: [PATCH 02/16] Fix Bug #53545 - javascript error in template git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10252 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/mcp/mcp_queue.php | 1 + phpBB/includes/mcp/mcp_reports.php | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 3783aadab5..8d9ece5205 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -105,6 +105,7 @@ class mcp_queue { $template->assign_vars(array( 'S_TOPIC_REVIEW' => true, + 'S_BBCODE_ALLOWED' => $post_info['enable_bbcode'], 'TOPIC_TITLE' => $post_info['topic_title']) ); } diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 7bed20187a..e19fe96963 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -116,6 +116,7 @@ class mcp_reports { $template->assign_vars(array( 'S_TOPIC_REVIEW' => true, + 'S_BBCODE_ALLOWED' => $post_info['enable_bbcode'], 'TOPIC_TITLE' => $post_info['topic_title']) ); } @@ -429,7 +430,7 @@ class mcp_reports 'PAGE_NUMBER' => on_page($total, $config['topics_per_page'], $start), 'TOPIC_ID' => $topic_id, 'TOTAL' => $total, - 'TOTAL_REPORTS' => ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total), + 'TOTAL_REPORTS' => ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total), ) ); @@ -671,7 +672,7 @@ function close_report($report_id_list, $mode, $action, $pm = false) $messenger->send($reporter['user_notify_type']); } } - + if (!$pm) { foreach ($post_info as $post) @@ -712,13 +713,13 @@ function close_report($report_id_list, $mode, $action, $pm = false) { $return_forum = sprintf($user->lang['RETURN_FORUM'], '', '') . '

'; } - + if (sizeof($topic_ids) === 1) { $return_topic = sprintf($user->lang['RETURN_TOPIC'], '', '') . '

'; } } - + trigger_error($user->lang[$success_msg] . '

' . $return_forum . $return_topic . sprintf($user->lang['RETURN_PAGE'], "", '')); } } From 9c7109d59e8d603208da0fcae3060d731f09ea42 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 3 Nov 2009 15:03:14 +0000 Subject: [PATCH 03/16] This is not perfect... i know, but at least it gives out more information than a simple "this topic/post does not exist". ;) Related to r9971 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10253 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/posting.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/phpBB/posting.php b/phpBB/posting.php index 1c7cd95b81..f5d1346865 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -95,8 +95,8 @@ switch ($mode) FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . " f WHERE t.topic_id = $topic_id AND (f.forum_id = t.forum_id - OR f.forum_id = $forum_id) - AND t.topic_approved = 1"; + OR f.forum_id = $forum_id)" . + (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1'); break; case 'quote': @@ -125,7 +125,7 @@ switch ($mode) AND u.user_id = p.poster_id AND (f.forum_id = t.forum_id OR f.forum_id = $forum_id)" . - (($auth->acl_get('m_approve', $forum_id) && $mode != 'quote') ? '' : 'AND p.post_approved = 1'); + (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND p.post_approved = 1'); break; case 'smilies': @@ -171,6 +171,13 @@ if (!$post_data) trigger_error(($mode == 'post' || $mode == 'bump' || $mode == 'reply') ? 'NO_TOPIC' : 'NO_POST'); } +// Not able to reply to unapproved posts/topics +// TODO: add more descriptive language key +if ($auth->acl_get('m_approve', $forum_id) && ((($mode == 'reply' || $mode == 'bump') && !$post_data['topic_approved']) || ($mode == 'quote' && !$post_data['post_approved']))) +{ + trigger_error(($mode == 'reply' || $mode == 'bump') ? 'TOPIC_UNAPPROVED' : 'POST_UNAPPROVED'); +} + if ($mode == 'popup') { upload_popup($post_data['forum_style']); From f0ef35ce6ed4b6e2d17a299a5ee250c32f41ad56 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Thu, 5 Nov 2009 14:58:25 +0000 Subject: [PATCH 04/16] update to r10069 (try to detect auto completion on input fields and do not submit form if user uses enter key for auto completion instead of right arrow key) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10254 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/forum_fn.js | 38 +++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 11e4315e2a..153f0c2ae5 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -317,6 +317,9 @@ function find_in_tree(node, tag, type, class_name) } } +var in_autocomplete = false; +var last_key_entered = ''; + /** * Usually used for onkeypress event, to submit a form on enter */ @@ -326,9 +329,27 @@ function submit_default_button(event, selector, class_name) if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode)) event.which = event.charCode || event.keyCode; + // Keycode is array down? + if (event.keyCode && event.keyCode == 40) + in_autocomplete = true; + + // Make sure we are not within an "autocompletion" field + if (in_autocomplete) + { + // If return pressed and key changed we reset the autocompletion + if (!last_key_entered || last_key_entered == event.which) + { + in_autocompletion = false; + return true; + } + } + // Keycode is not return, then return. ;) if (event.which != 13) + { + last_key_entered = event.which; return true; + } var current = selector['parentNode']; @@ -373,12 +394,29 @@ function apply_onkeypress_event() if (!default_button || default_button.length <= 0) return true; + // Keycode is array down? + if (e.keyCode && e.keyCode == 40) + in_autocomplete = true; + + // Make sure we are not within an "autocompletion" field + if (in_autocomplete) + { + // If return pressed and key changed we reset the autocompletion + if (!last_key_entered || last_key_entered == e.which) + { + in_autocompletion = false; + return true; + } + } + if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) { default_button.click(); return false; } + last_key_entered = e.which; + return true; }); From 91721d67fa975913a25f1005acdbc493dc7ac1be Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Fri, 6 Nov 2009 14:59:02 +0000 Subject: [PATCH 05/16] simplify the js code a bit and also detect up arrow key for auto completion git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10255 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/forum_fn.js | 45 ++++++++++----------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 153f0c2ae5..e1726430b8 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -321,16 +321,12 @@ var in_autocomplete = false; var last_key_entered = ''; /** -* Usually used for onkeypress event, to submit a form on enter +* Check event key */ -function submit_default_button(event, selector, class_name) +function phpbb_check_key(event) { - // Add which for key events - if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode)) - event.which = event.charCode || event.keyCode; - - // Keycode is array down? - if (event.keyCode && event.keyCode == 40) + // Keycode is array down or up? + if (event.keyCode && (event.keyCode == 40 || event.keyCode == 38)) in_autocomplete = true; // Make sure we are not within an "autocompletion" field @@ -351,6 +347,21 @@ function submit_default_button(event, selector, class_name) return true; } + return false; +} + +/** +* Usually used for onkeypress event, to submit a form on enter +*/ +function submit_default_button(event, selector, class_name) +{ + // Add which for key events + if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode)) + event.which = event.charCode || event.keyCode; + + if (phpbb_set_autocomplete(event)) + return true; + var current = selector['parentNode']; // Search parent form element @@ -394,20 +405,8 @@ function apply_onkeypress_event() if (!default_button || default_button.length <= 0) return true; - // Keycode is array down? - if (e.keyCode && e.keyCode == 40) - in_autocomplete = true; - - // Make sure we are not within an "autocompletion" field - if (in_autocomplete) - { - // If return pressed and key changed we reset the autocompletion - if (!last_key_entered || last_key_entered == e.which) - { - in_autocompletion = false; - return true; - } - } + if (phpbb_check_key(e)) + return true; if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) { @@ -415,8 +414,6 @@ function apply_onkeypress_event() return false; } - last_key_entered = e.which; - return true; }); From b35b4063f405729fc391cf2d53d376bc95e493d8 Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Sat, 7 Nov 2009 13:33:19 +0000 Subject: [PATCH 06/16] #53655 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10256 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 3 ++- phpBB/memberlist.php | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 0d3299eb89..f824d25e53 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -212,7 +212,8 @@
  • [Fix] Only check whether forum image exists if forum image is specified. (Bug #51905)
  • [Fix] Fixed database updater for changes to columns having default value in MSSQL (adding/dropping constraints).
  • [Fix] Jabber SASL PLAIN authentication failures. (Bug #52995)
    • -
  • [Change] Database updater now supports checking for existing/missing indexes.
    • +
  • [Fix] Check sort options on memberlist to avoid a general error. (Bug #53655)
    • +
  • [Change] Database updater now supports checking for existing/missing indexes.
  • [Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).
  • [Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.
  • [Change] Template engine now permits variable includes to a limited extent.
    • diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 11ff9e7685..eaaf19a14b 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -975,10 +975,12 @@ switch ($mode) $msn = request_var('msn', ''); $jabber = request_var('jabber', ''); $search_group_id = request_var('search_group_id', 0); - + + // when using these, make sure that actually have values defined in $find_key_match $joined_select = request_var('joined_select', 'lt'); $active_select = request_var('active_select', 'lt'); $count_select = request_var('count_select', 'eq'); + $joined = explode('-', request_var('joined', '')); $active = explode('-', request_var('active', '')); $count = (request_var('count', '') !== '') ? request_var('count', 0) : ''; @@ -1016,9 +1018,9 @@ switch ($mode) $sql_where .= ($yahoo) ? ' AND u.user_yim ' . $db->sql_like_expression(str_replace('*', $db->any_char, $yahoo)) . ' ' : ''; $sql_where .= ($msn) ? ' AND u.user_msnm ' . $db->sql_like_expression(str_replace('*', $db->any_char, $msn)) . ' ' : ''; $sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', $db->any_char, $jabber)) . ' ' : ''; - $sql_where .= (is_numeric($count)) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : ''; - $sql_where .= (sizeof($joined) > 1) ? " AND u.user_regdate " . $find_key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, intval($joined[1]), intval($joined[2]), intval($joined[0])) : ''; - $sql_where .= ($auth->acl_get('u_viewonline') && sizeof($active) > 1) ? " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : ''; + $sql_where .= (is_numeric($count) && isset($find_key_match[$count_select])) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : ''; + $sql_where .= (sizeof($joined) > 1 && isset($find_key_match[$joined_select])) ? " AND u.user_regdate " . $find_key_match[$joined_select] . ' ' . gmmktime(0, 0, 0, intval($joined[1]), intval($joined[2]), intval($joined[0])) : ''; + $sql_where .= ($auth->acl_get('u_viewonline') && sizeof($active) > 1 && isset($find_key_match[$active_select])) ? " AND u.user_lastvisit " . $find_key_match[$active_select] . ' ' . gmmktime(0, 0, 0, $active[1], intval($active[2]), intval($active[0])) : ''; $sql_where .= ($search_group_id) ? " AND u.user_id = ug.user_id AND ug.group_id = $search_group_id AND ug.user_pending = 0 " : ''; if ($search_group_id) From 0382b08fe2e5fd28296cb3989ec72a01321d2fe1 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 7 Nov 2009 15:11:40 +0000 Subject: [PATCH 07/16] fix whitespaces/tabs in r10256 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10257 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 2 +- phpBB/memberlist.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f824d25e53..c28611fd6b 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -213,7 +213,7 @@
  • [Fix] Fixed database updater for changes to columns having default value in MSSQL (adding/dropping constraints).
  • [Fix] Jabber SASL PLAIN authentication failures. (Bug #52995)
  • [Fix] Check sort options on memberlist to avoid a general error. (Bug #53655)
    • -
  • [Change] Database updater now supports checking for existing/missing indexes.
    • +
  • [Change] Database updater now supports checking for existing/missing indexes.
  • [Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).
  • [Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.
  • [Change] Template engine now permits variable includes to a limited extent.
    • diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index eaaf19a14b..7cffbfd854 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -975,12 +975,12 @@ switch ($mode) $msn = request_var('msn', ''); $jabber = request_var('jabber', ''); $search_group_id = request_var('search_group_id', 0); - - // when using these, make sure that actually have values defined in $find_key_match + + // when using these, make sure that we actually have values defined in $find_key_match $joined_select = request_var('joined_select', 'lt'); $active_select = request_var('active_select', 'lt'); $count_select = request_var('count_select', 'eq'); - + $joined = explode('-', request_var('joined', '')); $active = explode('-', request_var('active', '')); $count = (request_var('count', '') !== '') ? request_var('count', 0) : ''; From b39f618001b54a0213e2c80e70e85dd49ffc6fe6 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 8 Nov 2009 11:17:32 +0000 Subject: [PATCH 08/16] Fix Bug #53435 - unneccessary error on forum creation screen, actually, this code is no longer even executed since RC4 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10258 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_forums.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index cc56aba369..bde59ec870 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -75,13 +75,6 @@ class acp_forums trigger_error($user->lang['NO_PERMISSION_FORUM_ADD'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); } - case 'copy_perm': - - if (!(($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth')))) - { - trigger_error($user->lang['NO_PERMISSION_COPY'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); - } - break; } From 700347738c61bc98472c1860e1f5ec129a5a467f Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 9 Nov 2009 16:29:30 +0000 Subject: [PATCH 10/16] merging r10260 Fix sql error in cache_moderators() if using postgresql. (Bug #53765) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_6@10261 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/functions_admin.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c28611fd6b..becfa021c6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -213,6 +213,7 @@
  • [Fix] Fixed database updater for changes to columns having default value in MSSQL (adding/dropping constraints).
  • [Fix] Jabber SASL PLAIN authentication failures. (Bug #52995)
  • [Fix] Check sort options on memberlist to avoid a general error. (Bug #53655)
    • +
  • [Fix] Fix sql error in cache_moderators() if using postgresql. (Bug #53765)
  • [Change] Database updater now supports checking for existing/missing indexes.
  • [Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).
  • [Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.
    • diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 92dcf60ee0..ddadda8ed2 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2361,8 +2361,8 @@ function cache_moderators() 'FROM' => array( ACL_OPTIONS_TABLE => 'o', USER_GROUP_TABLE => 'ug', - ACL_GROUPS_TABLE => 'a', GROUPS_TABLE => 'g', + ACL_GROUPS_TABLE => 'a', ), 'LEFT_JOIN' => array( From 43598d7727c41a180d45f7019a7adc26d7365b9e Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 9 Nov 2009 16:49:15 +0000 Subject: [PATCH 11/16] merge r10262 Fix for r10255 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_6@10263 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/forum_fn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index e1726430b8..074c250b18 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -359,7 +359,7 @@ function submit_default_button(event, selector, class_name) if (!event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode)) event.which = event.charCode || event.keyCode; - if (phpbb_set_autocomplete(event)) + if (phpbb_check_key(event)) return true; var current = selector['parentNode']; From 0cdf46db0fbf2547902e42f0839cf384d509ef8e Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 14 Nov 2009 20:15:50 +0000 Subject: [PATCH 12/16] merge r10267 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_6@10268 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/constants.php | 2 +- phpBB/install/database_update.php | 8 +++++++- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 7106c4efa9..398611d24e 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -25,7 +25,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.0.6-RC4'); +define('PHPBB_VERSION', '3.0.6'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index e3511e89a4..8cac19fdbc 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -$updates_to_version = '3.0.6-RC4'; +$updates_to_version = '3.0.6'; // Enter any version to update from to test updates. The version within the db will not be updated. $debug_from_version = false; @@ -891,6 +891,8 @@ function database_update_info() '3.0.6-RC2' => array(), // No changes from 3.0.6-RC3 to 3.0.6-RC4 '3.0.6-RC3' => array(), + // No changes from 3.0.6-RC4 to 3.0.6 + '3.0.6-RC4' => array(), ); } @@ -1559,6 +1561,10 @@ function change_database_data(&$no_updates, $version) // No changes from 3.0.6-RC3 to 3.0.6-RC4 case '3.0.6-RC3': break; + + // No changes from 3.0.6-RC4 to 3.0.6 + case '3.0.6-RC3': + break; } } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 30ca808ef5..1c75ee4886 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -239,7 +239,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6-RC4'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 46a07c94ba95d2a883e794742a0f8b1ef3f20714 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 14 Nov 2009 23:00:30 +0000 Subject: [PATCH 13/16] merge r10269 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_6@10270 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/database_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 8cac19fdbc..5eeb449019 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1563,7 +1563,7 @@ function change_database_data(&$no_updates, $version) break; // No changes from 3.0.6-RC4 to 3.0.6 - case '3.0.6-RC3': + case '3.0.6-RC4': break; } } From 7bf1e08a35d22472c02f94dfb2f831d401f02b1e Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 16 Nov 2009 10:33:51 +0000 Subject: [PATCH 14/16] merge r10271 (late-late fix. :) But good someone at least noticed) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_6@10272 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/install_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 6adebc7a64..9f5a428029 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -927,7 +927,7 @@ class install_update extends module { if (function_exists('phpbb_is_writable') && !phpbb_is_writable($phpbb_root_path . 'store/')) { - trigger_error(sprintf($user->lang['DIRECTORY_NOT_WRITABLE'], $phpbb_root_path . 'store/'), E_USER_ERROR); + trigger_error(sprintf('The directory “%s” is not writable.', $phpbb_root_path . 'store/'), E_USER_ERROR); } if ($use_method == '.zip') From 98a2e3b938e5785afa67f1baad874e631379034e Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 16 Nov 2009 17:09:15 +0000 Subject: [PATCH 15/16] merge focus qr code from 3_0_0 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_6@10277 89ea8834-ac86-4346-8a33-228a782c2dd0 --- .../styles/prosilver/template/quickreply_editor.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html index 1ec8e2b643..f56747a842 100644 --- a/phpBB/styles/prosilver/template/quickreply_editor.html +++ b/phpBB/styles/prosilver/template/quickreply_editor.html @@ -1,12 +1,16 @@