diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-15 18:51:04 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-15 18:51:04 +0200 |
| commit | 79f757d4b74e5d8b8ec74d6eb4da74c6cc03d526 (patch) | |
| tree | 216e859587f371e5eb7891f960dffaccba21c5dd /phpBB/download/file.php | |
| parent | 1e8c257bd4965c8f9e1c35688ba9fe0ad1044efb (diff) | |
| parent | 2d6df4c7fcc3b5afa83b92a35124024d4d57177d (diff) | |
| download | forums-79f757d4b74e5d8b8ec74d6eb4da74c6cc03d526.tar forums-79f757d4b74e5d8b8ec74d6eb4da74c6cc03d526.tar.gz forums-79f757d4b74e5d8b8ec74d6eb4da74c6cc03d526.tar.bz2 forums-79f757d4b74e5d8b8ec74d6eb4da74c6cc03d526.tar.xz forums-79f757d4b74e5d8b8ec74d6eb4da74c6cc03d526.zip | |
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
[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/file.php')
| -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 ed5c4f55b8..c17f0cf018 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)) |