From 5003595ed6f05de7b6c50973aa26bb573d365caa Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Tue, 2 Mar 2010 19:30:37 +0000 Subject: [PATCH 1/2] Missed one half of bug #54855 whoops --- phpBB/docs/CHANGELOG.html | 1 + phpBB/language/en/email/admin_welcome_inactive.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4e9adaa1f9..53863da302 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -97,6 +97,7 @@
  • [Fix] No longer return the character O in generated random strings and passwords. (Bug #57345)
  • [Fix] Allow redirect() function to redirect across directories. (Bug #56965)
  • [Fix] Add terminating semicolons to JavaScript code. (Bug #58085 - Patch by nn-)
    • +
  • [Fix] Minor language fixes. (Bug #54855)
  • [Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)
    • diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt index e0970d3ff3..30b3aae852 100644 --- a/phpBB/language/en/email/admin_welcome_inactive.txt +++ b/phpBB/language/en/email/admin_welcome_inactive.txt @@ -10,7 +10,7 @@ Username: {USERNAME} Board URL: {U_BOARD} ---------------------------- -Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this has occured. +Your account is currently inactive and will need to be approved by an administrator before you can log in. Another email will be sent when this has occurred. Your password has been securely stored in our database and cannot be retrieved. In the event that it is forgotten, you will be able to reset it using the email address associated with your account. From 93a2407f6549a0236741973c1fdc980539ce6c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20A=2E=20Ruszczy=C5=84ski?= Date: Tue, 2 Mar 2010 20:36:26 +0100 Subject: [PATCH 2/2] Bug #54945 again: MySQL 4 does not support aggregation in ORDER BY. Moved the MIN(smiley_order) to the SELECT column list now, so it can be used for sorting on MySQL 4, but also still works on MSSQL, which the bug was originally about. --- phpBB/includes/functions_posting.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 49ea382411..21c5fe7aca 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -85,10 +85,10 @@ function generate_smilies($mode, $forum_id) if ($mode == 'window') { - $sql = 'SELECT smiley_url, MIN(emotion) as emotion, MIN(code) AS code, smiley_width, smiley_height + $sql = 'SELECT smiley_url, MIN(emotion) as emotion, MIN(code) AS code, smiley_width, smiley_height, MIN(smiley_order) AS min_smiley_order FROM ' . SMILIES_TABLE . ' GROUP BY smiley_url, smiley_width, smiley_height - ORDER BY MIN(smiley_order)'; + ORDER BY min_smiley_order'; $result = $db->sql_query_limit($sql, $config['smilies_per_page'], $start, 3600); } else