makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix nasty error in functions_admin generating a fatal error on inclusion

Browse source 
- adjusted error reporting level to get those errors instead of just the script halting.


git-svn-id: file:///svn/phpbb/trunk@5978 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-05-28 16:00:53 +00:00
parent d5b6b9cf85
commit d794557825
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/common.php
View file

@ -23,7 +23,8 @@ if (!defined('IN_PHPBB'))
$starttime = explode(' ', microtime()); $starttime = explode(' ', microtime());
$starttime = $starttime[1] + $starttime[0]; $starttime = $starttime[1] + $starttime[0];
error_reporting(E_ERROR | E_WARNING | E_PARSE); // Report all errors, except strict and notice
error_reporting(E_ALL ^ (E_NOTICE & E_STRICT));
/* /*
* Remove variables created by register_globals from the global scope * Remove variables created by register_globals from the global scope

5
phpBB/includes/functions_admin.php
View file

@ -1797,8 +1797,11 @@ function split_sql_file($sql, $delimiter)
{ {
$data[$key] = trim($value); $data[$key] = trim($value);
} }
// The empty case // The empty case
if (empty(end($data))) $end_data = end($data);
if (empty($end_data))
{ {
unset($data[key($data)]); unset($data[key($data)]);
} }