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.
This commit is contained in:
Josh Woody 2010-08-19 10:26:49 -05:00
commit 5eb175cefd

View file

@ -31,6 +31,12 @@ else if (isset($_SERVER['HTTP_USER_AGENT']) && strpos($_SERVER['HTTP_USER_AGENT'
if (isset($_GET['avatar'])) 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); require($phpbb_root_path . 'config.' . $phpEx);
if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type)) if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type))
@ -61,7 +67,7 @@ if (isset($_GET['avatar']))
$avatar_group = false; $avatar_group = false;
$exit = false; $exit = false;
if ($filename[0] === 'g') if (isset($filename[0]) && $filename[0] === 'g')
{ {
$avatar_group = true; $avatar_group = true;
$filename = substr($filename, 1); $filename = substr($filename, 1);