diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-11 15:46:14 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-09-17 13:59:57 +0200 |
| commit | 76e530196bb99d02b3d6d7736fde027fa5e2bae8 (patch) | |
| tree | 41e111d902adb24894ef13fe4dd3fa868cc57145 | |
| parent | d87d9d96b2de67480084f0626986dadaeeda7806 (diff) | |
| download | forums-76e530196bb99d02b3d6d7736fde027fa5e2bae8.tar forums-76e530196bb99d02b3d6d7736fde027fa5e2bae8.tar.gz forums-76e530196bb99d02b3d6d7736fde027fa5e2bae8.tar.bz2 forums-76e530196bb99d02b3d6d7736fde027fa5e2bae8.tar.xz forums-76e530196bb99d02b3d6d7736fde027fa5e2bae8.zip | |
[feature/request-class] Use the request class in the installer & updater.
Just like common.php database_update.php and install/index.php need to
include the request class files and create an instance for use in
request_var.
PHPBB3-9716
| -rw-r--r-- | phpBB/install/database_update.php | 13 | ||||
| -rw-r--r-- | phpBB/install/index.php | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index ca4ef817be..d571d41be4 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -66,6 +66,9 @@ require($phpbb_root_path . 'includes/template.' . $phpEx); require($phpbb_root_path . 'includes/session.' . $phpEx); require($phpbb_root_path . 'includes/auth.' . $phpEx); +require($phpbb_root_path . 'includes/request/deactivated_super_global.' . $phpEx); +require($phpbb_root_path . 'includes/request/request_interface.' . $phpEx); +require($phpbb_root_path . 'includes/request/request.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx)) @@ -92,10 +95,14 @@ else define('STRIP', (get_magic_quotes_gpc()) ? true : false); } +$request = new phpbb_request(); $user = new user(); $cache = new cache(); $db = new $sql_db(); +// make sure request_var uses this request instance +request_var($request, 0); // "dependency injection" for a function + // Add own hook handler, if present. :o if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx)) { @@ -1947,7 +1954,7 @@ class updater_db_tools 'VCHAR_CI' => '[varchar] (255)', 'VARBINARY' => '[varchar] (255)', ), - + 'mssqlnative' => array( 'INT:' => '[int]', 'BINT' => '[float]', @@ -1977,7 +1984,7 @@ class updater_db_tools 'VCHAR_CI' => '[varchar] (255)', 'VARBINARY' => '[varchar] (255)', ), - + 'oracle' => array( 'INT:' => 'number(%d)', 'BINT' => 'number(20)', @@ -2124,7 +2131,7 @@ class updater_db_tools case 'mssql_odbc': $this->sql_layer = 'mssql'; break; - + case 'mssqlnative': $this->sql_layer = 'mssqlnative'; break; diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 03b19d1c12..3e4331cde5 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -171,6 +171,10 @@ require($phpbb_root_path . 'includes/functions_install.' . $phpEx); $class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx); $class_loader->register(); +$request = new phpbb_request(); + +// make sure request_var uses this request instance +request_var($request, 0); // "dependency injection" for a function // Try and load an appropriate language if required $language = basename(request_var('language', '')); @@ -813,4 +817,4 @@ class module } } -?>
\ No newline at end of file +?> |