mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
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:
commit
5eb175cefd
1 changed files with 7 additions and 1 deletions
|
@ -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);
|
||||||
|
|
Loading…
Add table
Reference in a new issue