aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-06-08 10:05:44 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-06-08 10:05:44 +0000
commit0c57363fbc8769ef3e0774a9a03878553540bf9a (patch)
treeb4b1ff1a836076221d53e37de2de675060213530
parent0c19784ab9e5dae7828b3ebca619ec9fd1c301a7 (diff)
downloadforums-0c57363fbc8769ef3e0774a9a03878553540bf9a.tar
forums-0c57363fbc8769ef3e0774a9a03878553540bf9a.tar.gz
forums-0c57363fbc8769ef3e0774a9a03878553540bf9a.tar.bz2
forums-0c57363fbc8769ef3e0774a9a03878553540bf9a.tar.xz
forums-0c57363fbc8769ef3e0774a9a03878553540bf9a.zip
Fix bug #46065 - Correctly show private message history
Authorised by: acydburn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9561 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/functions_privmsgs.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 8fdbf83b4d..878ae3d23f 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -92,6 +92,7 @@
<li>[Fix] Sorting by author or subject on viewtopic now preserves the order. (Bug #44875)</li>
<li>[Fix] Correctly determine writable status of files on Windows operating system. (Bug #39035)</li>
<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>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Feature] Backported 3.2 captcha plugins.</li>
<li>[Feature] Introduced new ACM plugins:
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 05653f7e3b..96400ad70d 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1827,7 +1827,7 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
'U_QUOTE' => (!$in_post_mode && $auth->acl_get('u_sendpm') && $author_id != ANONYMOUS && $author_id != $user->data['user_id']) ? "$url&amp;mode=compose&amp;action=quote&amp;f=" . $folder_id . "&amp;p=" . $row['msg_id'] : '',
'U_POST_REPLY_PM' => ($author_id != $user->data['user_id'] && $author_id != ANONYMOUS && $auth->acl_get('u_sendpm')) ? "$url&amp;mode=compose&amp;action=reply&amp;f=$folder_id&amp;p=" . $row['msg_id'] : '')
);
- unset($rowset[$id]);
+ unset($rowset[$i]);
$prev_id = $id;
}