[Phpbb-checkins] r10204 - in /branches/phpBB-3_0_0/phpBB: includes/ucp/ucp_pm.php includes/ucp/ucp_pm_viewfolder.php styles/prosilver/template/ucp_pm_viewfolder.html styles/subsilver2/template/ucp_pm_viewfolder.html

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Sun Oct  4 12:08:12 2009
New Revision: 10204

Log:
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.

Modified:
    branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm.php
    branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html

Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm.php Sun Oct  4 12:08:12 2009
***************
*** 122,127 ****
--- 122,128 ----
  					// 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';

Modified: branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/ucp/ucp_pm_viewfolder.php Sun Oct  4 12:08:12 2009
***************
*** 432,438 ****
  		'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'),
  
--- 432,437 ----

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html Sun Oct  4 12:08:12 2009
***************
*** 82,91 ****
  		<!-- 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>
  	<!-- ENDIF -->
  
  	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
--- 82,95 ----
  		<!-- END messagerow -->
  
  		</ul>
  	<!-- ELSE -->
! 		<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 -->

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html Sun Oct  4 12:08:12 2009
***************
*** 92,98 ****
  		</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>
  		</tr>
  	<!-- END messagerow -->
  </table>
--- 92,104 ----
  		</tr>
  	<!-- BEGINELSE -->
  		<tr>
! 			<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>