diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-08-19 10:26:49 -0500 |
|---|---|---|
| committer | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-08-19 10:26:49 -0500 |
| commit | 5eb175cefd2bd240e28bb6eef1d2c9b08f97b361 (patch) | |
| tree | 942db147a3f80602033a70d72058bb524a81e351 | |
| parent | 68744484c839de8529483d588af818e703c31888 (diff) | |
| parent | 881c74688bc41d83c00db8c96715dc48d06c9d3d (diff) | |
| download | forums-5eb175cefd2bd240e28bb6eef1d2c9b08f97b361.tar forums-5eb175cefd2bd240e28bb6eef1d2c9b08f97b361.tar.gz forums-5eb175cefd2bd240e28bb6eef1d2c9b08f97b361.tar.bz2 forums-5eb175cefd2bd240e28bb6eef1d2c9b08f97b361.tar.xz forums-5eb175cefd2bd240e28bb6eef1d2c9b08f97b361.zip | |
Merge branch 'ticket/bantu/9694' into develop-olympus
* ticket/bantu/9694:
[ticket/9694] Call error_reporting() in download/file.php when in avatar mode.
[ticket/9694] Make sure string offset 0 exists to avoid E_NOTICE message.
| -rw-r--r-- | phpBB/download/file.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 2154847865..97f4ff3c8a 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -31,6 +31,12 @@ else if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT' if (isset($_GET['avatar'])) { + if (!defined('E_DEPRECATED')) + { + define('E_DEPRECATED', 8192); + } + error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED); + require($phpbb_root_path . 'config.' . $phpEx); if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type)) @@ -61,7 +67,7 @@ if (isset($_GET['avatar'])) $avatar_group = false; $exit = false; - if ($filename[0] === 'g') + if (isset($filename[0]) && $filename[0] === 'g') { $avatar_group = true; $filename = substr($filename, 1); |