diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-15 18:51:45 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-15 18:51:45 +0200 |
| commit | 835faff61ae8f81a93a2aa2ad34d7f9389421e72 (patch) | |
| tree | 2d6b10a92a4c00436c2f7adff8a7882d237ca2b7 /phpBB/download | |
| parent | 9b2a72e6ff35251f4af96b136848b9594e11bff7 (diff) | |
| parent | 79f757d4b74e5d8b8ec74d6eb4da74c6cc03d526 (diff) | |
| download | forums-835faff61ae8f81a93a2aa2ad34d7f9389421e72.tar forums-835faff61ae8f81a93a2aa2ad34d7f9389421e72.tar.gz forums-835faff61ae8f81a93a2aa2ad34d7f9389421e72.tar.bz2 forums-835faff61ae8f81a93a2aa2ad34d7f9389421e72.tar.xz forums-835faff61ae8f81a93a2aa2ad34d7f9389421e72.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10218] Prevent startime from being overwritten by deregister_globals()
[ticket/10218] Moving global deregistration, etc. to startup.php
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/download')
| -rw-r--r-- | phpBB/download/file.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index c26261a22d..735db70dfc 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -31,12 +31,7 @@ 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 . 'includes/startup.' . $phpEx); require($phpbb_root_path . 'config.' . $phpEx); if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type)) |