[Phpbb-checkins] r10184 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html includes/acp/acp_forums.php

[Andreas F. <ba...@ph...>]

Author: bantu
Date: Thu Sep 24 13:37:39 2009
New Revision: 10184

Log:
Fix bug #51905 - Only check whether forum image exists if forum image is specified.
Related to bug #39005.
Authorised by: acydburn

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Thu Sep 24 13:37:39 2009
***************
*** 210,215 ****
--- 210,216 ----
  		<li>[Fix] Do not display links to user/post search if search is disabled. (Bug #50685 - Patch by HardStyle)</li>
  		<li>[Fix] Fix icon alignment for forums with large descriptions in subsilver2. (Bug #50445)</li>
  		<li>[Fix] Correctly display underlined links placed in last line in viewtopic. (Bug #14811 - Patch by primehalo)</li>
+ 		<li>[Fix] Only check whether forum image exists if forum image is specified. (Bug #51905)</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Template engine now permits to a limited extent variable includes.</li>

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php Thu Sep 24 13:37:39 2009
***************
*** 907,913 ****
  			array('lang' => 'FORUM_TOPICS_PAGE', 'value' => $forum_data['forum_topics_per_page'], 'column_type' => 'TINT:0'),
  		);
  
! 		if (!file_exists($phpbb_root_path . $forum_data['forum_image']))
  		{
  			$errors[] = $user->lang['FORUM_IMAGE_NO_EXIST'];
  		}
--- 907,913 ----
  			array('lang' => 'FORUM_TOPICS_PAGE', 'value' => $forum_data['forum_topics_per_page'], 'column_type' => 'TINT:0'),
  		);
  
! 		if (!empty($forum_data['forum_image']) && !file_exists($phpbb_root_path . $forum_data['forum_image']))
  		{
  			$errors[] = $user->lang['FORUM_IMAGE_NO_EXIST'];
  		}