[Phpbb-checkins] r9899 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html includes/functions_posting.php

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

Author: bantu
Date: Fri Jul 31 16:49:14 2009
New Revision: 9899

Log:
Fix bug #48695 - Do not try to create thumbnails for images we cannot open properly.

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/functions_posting.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 Fri Jul 31 16:49:14 2009
***************
*** 182,187 ****
--- 182,188 ----
  		<li>[Fix] Correctly add user to a group making it a default one. (Bug #48345 - Patch by rxu)</li>
  		<li>[Fix] Add log entry when copying forum permissions.</li>
  		<li>[Fix] Min/max characters per posts also affects polls option (Bug #47295 - Patch by nickvergessen)</li>
+ 		<li>[Fix] Do not try to create thumbnails for images we cannot open properly. (Bug #48695)</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] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
  		<li>[Change] Template engine now permits to a limited extent variable includes.</li>

Modified: branches/phpBB-3_0_0/phpBB/includes/functions_posting.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_posting.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_posting.php Fri Jul 31 16:49:14 2009
***************
*** 696,701 ****
--- 696,706 ----
  				break;
  			}
  
+ 			if (empty($image))
+ 			{
+ 				return false;
+ 			}
+ 
  			if ($type['version'] == 1)
  			{
  				$new_image = imagecreate($new_width, $new_height);