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/install/database_update.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/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index eae51b12a4..b4166186d3 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -7,17 +7,21 @@ * */ -$updates_to_version = '3.1.0-dev'; +define('UPDATES_TO_VERSION', '3.1.0-dev'); // Enter any version to update from to test updates. The version within the db will not be updated. -$debug_from_version = false; +define('DEBUG_FROM_VERSION', false); // Which oldest version does this updater support? -$oldest_from_version = '3.0.0'; +define('OLDEST_FROM_VERSION', '3.0.0'); // Return if we "just include it" to find out for which version the database update is responsible for if (defined('IN_PHPBB') && defined('IN_INSTALL')) { + $updates_to_version = UPDATES_TO_VERSION; + $debug_from_version = DEBUG_FROM_VERSION; + $oldest_from_version = OLDEST_FROM_VERSION; + return; } @@ -29,12 +33,12 @@ define('IN_INSTALL', 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); + +$updates_to_version = UPDATES_TO_VERSION; +$debug_from_version = DEBUG_FROM_VERSION; +$oldest_from_version = OLDEST_FROM_VERSION; + error_reporting(E_ALL); @set_time_limit(0); @@ -83,20 +87,6 @@ if (!defined('LOGIN_ATTEMPT_TABLE')) define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts'); } -// If we are on PHP >= 6.0.0 we do not need some code -if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) -{ - /** - * @ignore - */ - define('STRIP', false); -} -else -{ - @set_magic_quotes_runtime(0); - define('STRIP', (get_magic_quotes_gpc()) ? true : false); -} - $class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx); $class_loader->register(); |