mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 00:37:42 +02:00
Code Issues Releases Wiki Activity

Merge branch 'prep-release-3.0.9' into develop-olympus

Browse Source 
* 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
This commit is contained in:
Andreas Fischer
2011-06-15 18:51:04 +02:00
parent 1e8c257bd4 2d6df4c7fc
commit 79f757d4b7
6 changed files with 139 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
phpBB/install/database_update.php
View File

@@ -8,17 +8,21 @@
*
*/
$updates_to_version = '3.0.10-dev';
define('UPDATES_TO_VERSION', '3.0.10-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;
}
@@ -30,12 +34,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);
@@ -85,20 +89,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);
}
$user = new user();
$cache = new cache();
$db = new $sql_db();