diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-03-31 18:16:55 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-03-31 18:16:55 +0200 |
| commit | 7e2f16aafa47f8db51a12a293b0616cb75b4d12f (patch) | |
| tree | 3e5e62baab0038d4895eaa9c7a47dadbc3eb4e84 /phpBB/install | |
| parent | 17a7b570747a91321903e30f3c0dd6f8246c0047 (diff) | |
| parent | 9236dd4c471a6f7655bd00ae422a13013a400ac4 (diff) | |
| download | forums-7e2f16aafa47f8db51a12a293b0616cb75b4d12f.tar forums-7e2f16aafa47f8db51a12a293b0616cb75b4d12f.tar.gz forums-7e2f16aafa47f8db51a12a293b0616cb75b4d12f.tar.bz2 forums-7e2f16aafa47f8db51a12a293b0616cb75b4d12f.tar.xz forums-7e2f16aafa47f8db51a12a293b0616cb75b4d12f.zip | |
Merge remote-tracking branch 'github-igorw/feature/class-prefix' into develop
* github-igorw/feature/class-prefix:
[feature/class-prefix] Rename auth => phpbb_auth
[feature/class-prefix] Rename user and session to phpbb_*
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 4 | ||||
| -rw-r--r-- | phpBB/install/index.php | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 583574a245..a84136388c 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -84,8 +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 +120,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..13ab30a9fa 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -75,8 +75,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,8 +176,8 @@ $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(); -$auth = new auth(); +$user = new phpbb_user(); +$auth = new phpbb_auth(); // Add own hook handler, if present. :o if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx)) |