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/style.php | |
| 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/style.php')
| -rw-r--r-- | phpBB/style.php | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/phpBB/style.php b/phpBB/style.php index 11e6ce53f7..62be0dde2b 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -15,13 +15,7 @@ define('IN_PHPBB', true); $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -// Report all errors, except notices and deprecation messages -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)) @@ -29,11 +23,6 @@ if (!defined('PHPBB_INSTALLED') || empty($dbms) || empty($acm_type)) exit; } -if (version_compare(PHP_VERSION, '6.0.0-dev', '<')) -{ - @set_magic_quotes_runtime(0); -} - // Load Extensions if (!empty($load_extensions) && function_exists('dl')) { |