From a691f4c8bccccf2916aa5a0e1e36f69a97f36a2f Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 9 Nov 2009 16:23:15 +0000 Subject: [PATCH 001/201] Fix sql error in cache_moderators() if using postgresql. (Bug #53765) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10260 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 c693127b1805c521347aeb44acd9acf452ed94e4 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Mon, 9 Nov 2009 16:48:13 +0000 Subject: [PATCH 002/201] Fix for r10255 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10262 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 1f5e93eab2e8ab3edb2d7124843ba99533c5bd22 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 10 Nov 2009 10:14:19 +0000 Subject: [PATCH 003/201] Add 3.0.6 to changelog. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10264 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index becfa021c6..5e90e78d54 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -53,6 +53,7 @@
    1. Changelog
        +
      1. Changes since 3.0.6
      2. Changes since 3.0.5
      3. Changes since 3.0.4
      4. Changes since 3.0.3
        5. @@ -85,7 +86,13 @@
        -

        1.i. Changes since 3.0.5

        +

        1.i. Changes since 3.0.6

        + +
          + +
        + +

        1.ii. Changes since 3.0.5

        • [Fix] Allow whitespaces in avatar gallery names. (Bug #44955)
          • @@ -307,7 +314,7 @@
        • [Feature] Send anonymous statistical information to phpBB on installation and update (optional).
        -

        1.ii. Changes since 3.0.4

        +

        1.iii. Changes since 3.0.4

        • [Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)
          • @@ -396,7 +403,7 @@
        • [Sec] Only use forum id supplied for posting if global announcement detected. (Reported by nickvergessen)
        -

        1.iii. Changes since 3.0.3

        +

        1.iv. Changes since 3.0.3

        • [Fix] Allow mixed-case template directories to be inherited (Bug #36725)
          • @@ -428,7 +435,7 @@
        • [Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)
        -

        1.iv. Changes since 3.0.2

        +

        1.v. Changes since 3.0.2

        • [Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)
          • @@ -527,7 +534,7 @@
        • [Sec Precaution] Stricter validation of the HTTP_HOST header (Thanks to Techie-Micheal et al for pointing out possible issues in derived code)
        -

        1.v. Changes since 3.0.1

        +

        1.vi. Changes since 3.0.1

        • [Fix] Ability to set permissions on non-mysql dbms (Bug #24955)
          • @@ -575,7 +582,7 @@
        • [Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)
        -

        1.vi Changes since 3.0.0

        +

        1.vii Changes since 3.0.0

        • [Change] Validate birthdays (Bug #15004)
          • @@ -646,7 +653,7 @@
        • [Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)
        -

        1.vii. Changes since 3.0.RC8

        +

        1.viii. Changes since 3.0.RC8

        • [Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)
          • @@ -655,7 +662,7 @@
        • [Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)
        -

        1.viii. Changes since 3.0.RC7

        +

        1.ix. Changes since 3.0.RC7

        • [Fix] Fixed MSSQL related bug in the update system
          • @@ -690,7 +697,7 @@
        • [Fix] No duplication of active topics (Bug #15474)
        -

        1.ix. Changes since 3.0.RC6

        +

        1.x. Changes since 3.0.RC6

        • [Fix] Submitting language changes using acp_language (Bug #14736)
          • @@ -700,7 +707,7 @@
        • [Fix] Able to request new password (Bug #14743)
        -

        1.x. Changes since 3.0.RC5

        +

        1.xi. Changes since 3.0.RC5

        • [Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.
          • @@ -763,7 +770,7 @@
        • [Sec] New password hashing mechanism for storing passwords (#i42)
        -

        1.xi. Changes since 3.0.RC4

        +

        1.xii. Changes since 3.0.RC4

        • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
          • @@ -814,7 +821,7 @@
        • [Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)
        -

        1.xii. Changes since 3.0.RC3

        +

        1.xiii. Changes since 3.0.RC3

        • [Fix] Fixing some subsilver2 and prosilver style issues
          • @@ -923,7 +930,7 @@
        -

        1.xiii. Changes since 3.0.RC2

        +

        1.xiv. Changes since 3.0.RC2

        • [Fix] Re-allow searching within the memberlist
          • @@ -969,7 +976,7 @@
        -

        1.xiv. Changes since 3.0.RC1

        +

        1.xv. Changes since 3.0.RC1

        • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
          • From a0d7f6ebc4329c85b756eba98a713bc5f09c64a1 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 10 Nov 2009 10:23:07 +0000 Subject: [PATCH 004/201] Fix Bug #51095 - Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10265 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_ban.html | 6 +++--- phpBB/docs/CHANGELOG.html | 2 +- phpBB/styles/subsilver2/template/mcp_ban.html | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index bc326345b0..539e8032dd 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -93,15 +93,15 @@
          -
          +
          -
          +
          -
          +

          diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 5e90e78d54..babcd171c6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -89,7 +89,7 @@

          1.i. Changes since 3.0.6

            - +
          • [Fix] Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. (Bug #51095)

          1.ii. Changes since 3.0.5

          diff --git a/phpBB/styles/subsilver2/template/mcp_ban.html b/phpBB/styles/subsilver2/template/mcp_ban.html index 0e352b57dd..706c8b2cd2 100644 --- a/phpBB/styles/subsilver2/template/mcp_ban.html +++ b/phpBB/styles/subsilver2/template/mcp_ban.html @@ -84,15 +84,15 @@ {L_BAN_LENGTH}: - + {L_BAN_REASON}: - + {L_BAN_GIVE_REASON}: - +     From 978f707fd12698875e20b945f2bb30c82c6888c5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 14 Nov 2009 19:12:12 +0000 Subject: [PATCH 005/201] [Fix] Force full date for board online record date. Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10266 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/functions.php | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index babcd171c6..1fe45c97a1 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -90,6 +90,7 @@
          • [Fix] Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. (Bug #51095)
            • +
          • [Fix] Force full date for board online record date.

          1.ii. Changes since 3.0.5

          diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e787932441..812b672c5c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3959,7 +3959,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 $s_last_visit = ($user->data['user_id'] != ANONYMOUS) ? $user->format_date($user->data['session_last_visit']) : ''; // Get users online list ... if required - $l_online_users = $online_userlist = $l_online_record = ''; + $l_online_users = $online_userlist = $l_online_record = $l_online_time = ''; if ($config['load_online'] && $config['load_online_time'] && $display_online_list) { @@ -3982,15 +3982,11 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 set_config('record_online_date', time(), true); } - $l_online_record = sprintf($user->lang['RECORD_ONLINE_USERS'], $config['record_online_users'], $user->format_date($config['record_online_date'])); + $l_online_record = sprintf($user->lang['RECORD_ONLINE_USERS'], $config['record_online_users'], $user->format_date($config['record_online_date'], false, true)); $l_online_time = ($config['load_online_time'] == 1) ? 'VIEW_ONLINE_TIME' : 'VIEW_ONLINE_TIMES'; $l_online_time = sprintf($user->lang[$l_online_time], $config['load_online_time']); } - else - { - $l_online_time = ''; - } $l_privmsgs_text = $l_privmsgs_text_unread = ''; $s_privmsg_new = false; From 46112228c08d1ca935eba34ddd849eb9f7de6cf8 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sat, 14 Nov 2009 20:11:38 +0000 Subject: [PATCH 006/201] Tag as 3.0.6 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10267 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 e4d1addc2c74e84a737c5ca91f3f3379fb648c33 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sat, 14 Nov 2009 21:27:24 +0000 Subject: [PATCH 007/201] Fix Bug #53945 - Typo in r10267. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10269 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 f59a9221e9db58761fb9f792c7e5d1ce3c0b52b3 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Sun, 15 Nov 2009 22:30:07 +0000 Subject: [PATCH 008/201] Fix Bug #53965, Regression introduced in r9768 - Hardcode language for the time being. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10271 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 2ef4f51b4c9645834e9d6c0e5e45c1abc79cdaca Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Mon, 16 Nov 2009 11:02:28 +0000 Subject: [PATCH 009/201] #53905 - thanks DavidIQ git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10273 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/styles/prosilver/template/quickreply_editor.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html index 1ec8e2b643..8b6aaa12bc 100644 --- a/phpBB/styles/prosilver/template/quickreply_editor.html +++ b/phpBB/styles/prosilver/template/quickreply_editor.html @@ -1,9 +1,13 @@ diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html index cc4db0b760..97d2cda28e 100644 --- a/phpBB/styles/prosilver/template/captcha_recaptcha.html +++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html @@ -15,7 +15,7 @@