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

[Chris S. <too...@ph...>]

Author: toonarmy
Date: Sat Jul 18 23:29:25 2009
New Revision: 9785

Log:
Ensure user errors are displayed regardless of PHP settings. #47505

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/functions.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 Sat Jul 18 23:29:25 2009
***************
*** 163,168 ****
--- 163,169 ----
  		<li>[Fix] Add hard limit for smilies.</li>
  		<li>[Fix] Remove redundant SQL query from ucp.php. (Bug #40305)</li>
  		<li>[Fix] Reorder frame order of animated subsilver2 topic icons to be useful when animation is disabled. (Bug #29385 - Patch by prototech)</li>
+ 		<li>[Fix] Ensure user errors are displayed regardless of PHP settings. (Bug #47505)</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.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Sat Jul 18 23:29:25 2009
***************
*** 3295,3301 ****
  	global $phpEx, $phpbb_root_path, $msg_title, $msg_long_text;
  
  	// Do not display notices if we suppress them via @
! 	if (error_reporting() == 0)
  	{
  		return;
  	}
--- 3295,3301 ----
  	global $phpEx, $phpbb_root_path, $msg_title, $msg_long_text;
  
  	// Do not display notices if we suppress them via @
! 	if (error_reporting() == 0 && $errno != E_USER_ERROR && $errno != E_USER_WARNING && $errno != E_USER_NOTICE)
  	{
  		return;
  	}