some changelog changes and a small SQL correction

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9738 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/docs/CHANGELOG.html

@@ -94,7 +94,7 @@
 		<li>[Fix] Show report button in prosilver for guests who are allowed to report posts. (Bug #45695 - Patch by bantu)</li>
 		<li>[Fix] Correctly show private message history (Bug #46065 - Patch by bantu)</li>
 		<li>[Fix] Various XHTML mistakes in prosilver, subsilver2 and the ACP. (Bugs #25545 - Patch by bantu, #26315, #38555, #45505 - Patch by Raimon, #45785, #45865, #47085 - Patch by Raimon)</li>
-		<li>[Fix] Fix some ACP style issues (Bug #45975 - Patch by leviatan21)</li>
+		<li>[Fix] Fix some ACP style issues (Bug #45975 - Patch by leviatan21, Bug #16109 - Patch by prototech)</li>
 		<li>[Fix] Move post bump information markup to the template. (Bug #34295 - Patch by bantu)</li>
 		<li>[Fix] Show error in the ACP when template folder is not readable. (Bug #45705 - Patch by bantu)</li>
 		<li>[Fix] Adjust viewonline filename regular expression to be less strict. (Bug #46215 - Patch by bantu)</li>
@@ -122,7 +122,7 @@
 		<li>[Fix] Empty error message in UCP folder management when creating folder without name (Bug #39875 - Patch by nickvergessen)</li>
 		<li>[Fix] Wrong description in UCP group management implicates missing feature (Bug #19945 - Patch by nickvergessen)</li>
 		<li>[Fix] Do not throw an error when PDO is a shared module and not loaded preventing SQLite from being loaded.</li>
-		<li>[Fix] Fix unicode words wrong censoring. (Bug #16555 - Patch by rxu)</li>
+		<li>[Fix] Fix unicode words censoring. (Bug #16555 - Patches by rxu)</li>
 		<li>[Fix] Display coloured usernames in ACP groups management screens</li>
 		<li>[Fix] Correctly describe founder permissions on trace-information (Bug #37235 - Patch by nickvergessen)</li>
 		<li>[Fix] Correct the width value for poll_center.gif omitted in imageset.cfg for subsilver2. (Bug #43005 - Patch by rxu)</li>
@@ -144,12 +144,10 @@
 		<li>[Fix] Fix minor issue with L_QUOTE language string missing in several PM composing modes. (Bug #39625 - Patch by rxu)</li> 
 		<li>[Fix] Color bbcode now supports three-digit hex notation. (Bug #39965 - Patch by m0rpha)</li>
 		<li>[Fix] Search by authorname does not display posts of guests and deleted or deactivated users (Bug #36565, #47765 - Patch by nickvergessen)</li>
-		<li>[Fix] Further word censor fix to work with UTF8 correctly. (Patch by rxu)</li>
 		<li>[Fix] View end of ban in MCP and ACP when user is banned by duration (Bug #47815 - Patch by Pyramide)</li>
 		<li>[Fix] Display user's posts count in private message when it is equal to 0 (prosilver). (Bug #40155 - Patch by rxu)</li>
 		<li>[Fix] Disable word-censor option in UCP lacks the config-setting (Bug #47575 - Patch by 00mohgta7)</li>
 		<li>[Fix] Fix database updater and db tools to support multiple column changes/additions/removals with SQLite</li>
-		<li>[Fix] Fix cosmetic ACP bug showing on hover elements in IE7 (Bug #16109 - Patch by prototech)</li>
 		<li>[Fix] Correctly detect GZIP status in debug mode. (Bug #24075 - Patch by rxu)</li>
 		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
 		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>

phpBB/includes/mcp/mcp_warn.php

@@ -204,7 +204,7 @@ class mcp_warn
 
 		$sql = 'SELECT u.*, p.*
 			FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
-			WHERE post_id = $post_id
+			WHERE p.post_id = $post_id
 				AND u.user_id = p.poster_id";
 		$result = $db->sql_query($sql);
 		$user_row = $db->sql_fetchrow($result);