diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-06-24 21:13:53 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-06-24 21:13:53 +0000 |
| commit | 9c795870f9c8d5569365d9df9cc7207988dcb609 (patch) | |
| tree | f718baa9ebefb0f650cb90751409eefaa7011e3f | |
| parent | 2a8cd76f59a24256ae1cd66c8469c57896f8dd24 (diff) | |
| download | forums-9c795870f9c8d5569365d9df9cc7207988dcb609.tar forums-9c795870f9c8d5569365d9df9cc7207988dcb609.tar.gz forums-9c795870f9c8d5569365d9df9cc7207988dcb609.tar.bz2 forums-9c795870f9c8d5569365d9df9cc7207988dcb609.tar.xz forums-9c795870f9c8d5569365d9df9cc7207988dcb609.zip | |
Fix bug #37285 - [Change] Add quote-button for own pm's in pm-history
Authorised by: ToonArmy
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9671 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index acef0e5de0..3d407d3c77 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -147,6 +147,7 @@ <li>[Change] Ability to fetch moderators with get_moderators() even if load_moderators setting is off. (Bug #35955)</li> <li>[Change] Add WAI-ARIA landmarks for easier accessibility to the prosilver template (Bug #45715 - Patch by MarcoZ)</li> <li>[Change] "Post details" links with image in MCP. (Bug #39845 - Patch by leviatan21)</li> + <li>[Change] Add quote-button for own pm's in pm-history (Bug #37285 - Patch by nickvergessen)</li> <li>[Feature] Add confirmation for deactivating styles (Bug #14304 - Patch by leviatan21)</li> <li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li> <li>[Feature] Add confirmation for deactivating language packs (Patch by leviatan21)</li> diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 96400ad70d..271cce9f42 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1781,7 +1781,7 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode $decoded_message = false; - if ($in_post_mode && $auth->acl_get('u_sendpm') && $author_id != ANONYMOUS && $author_id != $user->data['user_id']) + if ($in_post_mode && $auth->acl_get('u_sendpm') && $author_id != ANONYMOUS) { $decoded_message = $message; decode_message($decoded_message, $row['bbcode_uid']); @@ -1824,7 +1824,7 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode 'MSG_ID' => $row['msg_id'], 'U_VIEW_MESSAGE' => "$url&f=$folder_id&p=" . $row['msg_id'], - 'U_QUOTE' => (!$in_post_mode && $auth->acl_get('u_sendpm') && $author_id != ANONYMOUS && $author_id != $user->data['user_id']) ? "$url&mode=compose&action=quote&f=" . $folder_id . "&p=" . $row['msg_id'] : '', + 'U_QUOTE' => (!$in_post_mode && $auth->acl_get('u_sendpm') && $author_id != ANONYMOUS) ? "$url&mode=compose&action=quote&f=" . $folder_id . "&p=" . $row['msg_id'] : '', 'U_POST_REPLY_PM' => ($author_id != $user->data['user_id'] && $author_id != ANONYMOUS && $auth->acl_get('u_sendpm')) ? "$url&mode=compose&action=reply&f=$folder_id&p=" . $row['msg_id'] : '') ); unset($rowset[$i]); |