diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-04 11:08:12 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-04 11:08:12 +0000 |
| commit | 53965f0085c6bc848a239208c078d29196636d21 (patch) | |
| tree | 4741cf3901a1394bb73ce5f2ccea800c00347dc0 /phpBB | |
| parent | a53c9abf7e866228563836d9dd4dc2b2d55672ed (diff) | |
| download | forums-53965f0085c6bc848a239208c078d29196636d21.tar forums-53965f0085c6bc848a239208c078d29196636d21.tar.gz forums-53965f0085c6bc848a239208c078d29196636d21.tar.bz2 forums-53965f0085c6bc848a239208c078d29196636d21.tar.xz forums-53965f0085c6bc848a239208c078d29196636d21.zip | |
Bug #52175
atm the "fix" with the most changes involved. We will inform style authors about these changes. We will not release RC2 to RC3 code changes, but will annnounce the style changes within the RC3 release announcement.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10204 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_viewfolder.html | 10 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html | 8 |
4 files changed, 15 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index 6ac02c7d0a..e1c51170db 100644 --- a/phpBB/includes/ucp/ucp_pm.php +++ b/phpBB/includes/ucp/ucp_pm.php @@ -122,6 +122,7 @@ class ucp_pm // trigger_error('NO_AUTH_SEND_MESSAGE'); $template->assign_vars(array( 'S_NO_AUTH_SEND_MESSAGE' => true, + 'S_COMPOSE_PM_VIEW' => true, )); $tpl_file = 'ucp_pm_viewfolder'; diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index 6493b54e1f..33d2c9fb6f 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -432,7 +432,6 @@ function get_pm_from($folder_id, $folder, $user_id) 'TOTAL_MESSAGES' => (($pm_count == 1) ? $user->lang['VIEW_PM_MESSAGE'] : sprintf($user->lang['VIEW_PM_MESSAGES'], $pm_count)), 'POST_IMG' => (!$auth->acl_get('u_sendpm')) ? $user->img('button_topic_locked', 'POST_PM_LOCKED') : $user->img('button_pm_new', 'POST_NEW_PM'), - 'L_NO_MESSAGES' => (!$auth->acl_get('u_sendpm')) ? $user->lang['NO_AUTH_SEND_MESSAGE'] : $user->lang['NO_MESSAGES'], 'S_NO_AUTH_SEND_MESSAGE' => !$auth->acl_get('u_sendpm'), diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html index 05d213f2ed..7b309a74f7 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html @@ -82,10 +82,14 @@ <!-- END messagerow --> </ul> - <!-- ELSEIF S_NO_AUTH_SEND_MESSAGE --> - <p><strong><!-- IF S_USER_NEW -->{L_USER_NEW_PERMISSION_DISALLOWED}<!-- ELSE -->{L_NO_AUTH_SEND_MESSAGE}<!-- ENDIF --></p></strong> <!-- ELSE --> - <p><strong>{L_NO_MESSAGES}</strong></p> + <p><strong> + <!-- IF S_COMPOSE_PM_VIEW and S_NO_AUTH_SEND_MESSAGE --> + <!-- IF S_USER_NEW -->{L_USER_NEW_PERMISSION_DISALLOWED}<!-- ELSE -->{L_NO_AUTH_SEND_MESSAGE}<!-- ENDIF --> + <!-- ELSE --> + {L_NO_MESSAGES} + <!-- ENDIF --> + </strong></p> <!-- ENDIF --> <!-- IF FOLDER_CUR_MESSAGES neq 0 --> diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html b/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html index c86211bc7e..1663502865 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html @@ -92,7 +92,13 @@ </tr> <!-- BEGINELSE --> <tr> - <td class="row1" colspan="{$COLSPAN}" height="30" align="center" valign="middle"><span class="gen"><!-- IF S_USER_NEW -->{L_USER_NEW_PERMISSION_DISALLOWED}<!-- ELSE -->{L_NO_MESSAGES}<!-- ENDIF --></span></td> + <td class="row1" colspan="{$COLSPAN}" height="30" align="center" valign="middle"><span class="gen"> + <!-- IF S_COMPOSE_PM_VIEW and S_NO_AUTH_SEND_MESSAGE --> + <!-- IF S_USER_NEW -->{L_USER_NEW_PERMISSION_DISALLOWED}<!-- ELSE -->{L_NO_AUTH_SEND_MESSAGE}<!-- ENDIF --> + <!-- ELSE --> + {L_NO_MESSAGES} + <!-- ENDIF --> + </span></td> </tr> <!-- END messagerow --> </table> |