diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 02:50:19 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 18:14:07 +0200 |
| commit | 6deb7b3671c29ab7ce1db6e11b5c6be0950d265f (patch) | |
| tree | 01f69230e6d0c02827268975dc64af781f06b809 /phpBB/install | |
| parent | 0ae491c5fa9228304e17431ea7aa8ba9303cc193 (diff) | |
| download | forums-6deb7b3671c29ab7ce1db6e11b5c6be0950d265f.tar forums-6deb7b3671c29ab7ce1db6e11b5c6be0950d265f.tar.gz forums-6deb7b3671c29ab7ce1db6e11b5c6be0950d265f.tar.bz2 forums-6deb7b3671c29ab7ce1db6e11b5c6be0950d265f.tar.xz forums-6deb7b3671c29ab7ce1db6e11b5c6be0950d265f.zip | |
[feature/class-prefix] Rename user and session to phpbb_*
PHPBB-10609
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 3 | ||||
| -rw-r--r-- | phpBB/install/index.php | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 18ca4870fb..fb5e79358d 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -84,7 +84,6 @@ if (!empty($load_extensions) && function_exists('dl')) // Include files require($phpbb_root_path . 'includes/class_loader.' . $phpEx); -require($phpbb_root_path . 'includes/session.' . $phpEx); require($phpbb_root_path . 'includes/auth.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); @@ -122,7 +121,7 @@ $phpbb_class_loader->set_cache($cache->get_driver()); $phpbb_dispatcher = new phpbb_event_dispatcher(); $request = new phpbb_request(); -$user = new user(); +$user = new phpbb_user(); $db = new $sql_db(); // make sure request_var uses this request instance diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 6c32a322f8..d3cb68e82e 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -76,7 +76,6 @@ require($phpbb_root_path . 'includes/functions.' . $phpEx); phpbb_require_updated('includes/functions_content.' . $phpEx, true); include($phpbb_root_path . 'includes/auth.' . $phpEx); -include($phpbb_root_path . 'includes/session.' . $phpEx); include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); require($phpbb_root_path . 'includes/functions_install.' . $phpEx); @@ -178,7 +177,7 @@ $sub = request_var('sub', ''); // Set PHP error handler to ours set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); -$user = new user(); +$user = new phpbb_user(); $auth = new auth(); // Add own hook handler, if present. :o |