[Phpbb-checkins] r10074 - in /branches/phpBB-3_0_0/phpBB: includes/acp/acp_styles.php language/en/acp/styles.php

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

Author: acydburn
Date: Mon Aug 31 12:25:28 2009
New Revision: 10074

Log:
Fix wrong error message for non-writable template file in acp_styles.php - Bug #50045

Modified:
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_styles.php
    branches/phpBB-3_0_0/phpBB/language/en/acp/styles.php

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_styles.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_styles.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_styles.php Mon Aug 31 12:25:28 2009
***************
*** 747,753 ****
  			{
  				if (!($fp = @fopen($file, 'wb')))
  				{
! 					trigger_error($user->lang['NO_TEMPLATE'] . adm_back_link($this->u_action), E_USER_WARNING);
  				}
  				fwrite($fp, $template_data);
  				fclose($fp);
--- 747,754 ----
  			{
  				if (!($fp = @fopen($file, 'wb')))
  				{
! 					// File exists and is writeable, but still not able to be written to
! 					trigger_error(sprintf($user->lang['TEMPLATE_FILE_NOT_WRITABLE'], htmlspecialchars($template_file)) . adm_back_link($this->u_action), E_USER_WARNING);
  				}
  				fwrite($fp, $template_data);
  				fclose($fp);

Modified: branches/phpBB-3_0_0/phpBB/language/en/acp/styles.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/acp/styles.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/acp/styles.php Mon Aug 31 12:25:28 2009
***************
*** 392,397 ****
--- 392,398 ----
  	'TEMPLATE_LOCATION'			=> 'Store templates in',
  	'TEMPLATE_LOCATION_EXPLAIN'	=> 'Images are always stored on the filesystem.',
  	'TEMPLATE_NAME'				=> 'Template name',
+ 	'TEMPLATE_FILE_NOT_WRITABLE'=> 'Unable to write to template file %s. Please check the permissions for the directory and the files.',
  	'TEMPLATE_REFRESHED'		=> 'Template refreshed successfully.',
  
  	'THEME_ADDED'				=> 'New theme added on filesystem.',