diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-12-04 19:58:42 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-12-04 19:58:42 +0000 |
| commit | 00d870676574b7555625f1573c73d4a22f16be38 (patch) | |
| tree | 0edd462a551eb419e870df037ddf1645fc045620 | |
| parent | c931ce3a54bb76543a133cef0d91984a083874ae (diff) | |
| download | forums-00d870676574b7555625f1573c73d4a22f16be38.tar forums-00d870676574b7555625f1573c73d4a22f16be38.tar.gz forums-00d870676574b7555625f1573c73d4a22f16be38.tar.bz2 forums-00d870676574b7555625f1573c73d4a22f16be38.tar.xz forums-00d870676574b7555625f1573c73d4a22f16be38.zip | |
- Do not show 'Forward' button if the user cannot send PM's.
- Correct colspan on prosilver mcp_front.html. #37515
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9174 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_front.html | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d0de2c9a50..a468ef6976 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -101,6 +101,8 @@ <li>[Fix] Extend vertical line for last post column if no posts in forum (Bug #37125)</li> <li>[Fix] correctly update last topic/forum information if changing guest usernames through editing posts (Bug #38095)</li> <li>[Fix] fix postcount resync for situations where low and high post ids are higher than step value, resulting in users having 0 posts. (Bug #38195)</li> + <li>[Fix] Use a left join for the topics table on search to avoid trouble with FROM syntax on some databases (Bug #37005)</li> + <li>[Fix] Do not show 'Forward' button if the user cannot send PM's</li> <li>[Change] Alllow applications to set custom module inclusion path (idea by HoL)</li> <li>[Change] Handle checking for duplicate usernames in chunks (Bug #17285 - Patch by A_Jelly_Doughnut)</li> <li>[Change] Better handling and finer control for custom profile fields visibility options. (Patch by Highway of Life)</li> @@ -111,7 +113,6 @@ <li>[Feature] Added 'AGO' setting to relative date strings. For example: posted 14 minutes ago. (Patch by BartVB)</li> <li>[Sec] Fixed an issue where deactivated accounts could be re-activated without the required privileges. (Reported by Jorick)</li> <li>[Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)</li> - <li>[Fix] Use a left join for the topics table on search to avoid trouble with FROM syntax on some databases (Bug #37005)</li> </ul> <a name="v302"></a><h3>1.ii. Changes since 3.0.2</h3> diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 45f5cf87a6..bdd0e44ea8 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -221,7 +221,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'S_SPECIAL_FOLDER' => in_array($folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)), 'U_PRINT_PM' => ($config['print_pm'] && $auth->acl_get('u_pm_printpm')) ? "$url&f=$folder_id&p=" . $message_row['msg_id'] . "&view=print" : '', - 'U_FORWARD_PM' => ($config['forward_pm'] && $auth->acl_get('u_pm_forward')) ? "$url&mode=compose&action=forward&f=$folder_id&p=" . $message_row['msg_id'] : '') + 'U_FORWARD_PM' => ($config['forward_pm'] && $auth->acl_get('u_sendpm') && $auth->acl_get('u_pm_forward')) ? "$url&mode=compose&action=forward&f=$folder_id&p=" . $message_row['msg_id'] : '') ); // Display not already displayed Attachments for this post, we already parsed them. ;) diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html index 5dd1d9a823..e0152391b9 100644 --- a/phpBB/styles/prosilver/template/mcp_front.html +++ b/phpBB/styles/prosilver/template/mcp_front.html @@ -129,7 +129,7 @@ </tr> <!-- BEGINELSE --> <tr> - <td colspan="5">{L_NO_ENTRIES}</td> + <td colspan="6">{L_NO_ENTRIES}</td> </tr> <!-- END log --> </tbody> |