diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-10-10 18:39:44 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-10-10 18:39:44 +0200 |
| commit | a885095897054c91ab68b753ce2a86ae74f2f666 (patch) | |
| tree | 9adb9074112239838a1a69078702f08e0bcda9be /phpBB/common.php | |
| parent | 9a39f55c24fee8fe817823097e8f596b92ab7049 (diff) | |
| parent | c2ffa78521a656b1a183d75c8de2f88624011967 (diff) | |
| download | forums-a885095897054c91ab68b753ce2a86ae74f2f666.tar forums-a885095897054c91ab68b753ce2a86ae74f2f666.tar.gz forums-a885095897054c91ab68b753ce2a86ae74f2f666.tar.bz2 forums-a885095897054c91ab68b753ce2a86ae74f2f666.tar.xz forums-a885095897054c91ab68b753ce2a86ae74f2f666.zip | |
Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class: (21 commits)
[feature/request-class] Fix mcp.php mode parameter
[feature/request-class] Fix remember and session hide on login
[feature/request-class] Fix missing include in database_update
[feature/request-class] Make additional request test cases run
[feature/request-class] Adjust some trailing newlines
[feature/request-class] Remove tricky $_* is_array from acp_profile
[feature/request-class] Convert any direct access to $_* to use $request
[feature/request-class] Add $request to style.php, minor change
[feature/request-class] Prevent recursive_set_var from applying htmlspecialchars twice
[feature/request-class] Removal of direct access to some superglobals
[feature/request-class] Refactor request classes to use autoloading
[feature/request-class] Automatically normalize multibyte data in request_var
[feature/request-class] Request class test now uses a type cast helper mock.
[feature/request-class] Refactored request class and wrapper functions.
[feature/request-class] Extracted type casting helpers from the request class.
[feature/request-class] Replace direct use of GET/REQUEST with request_var.
[feature/request-class] Use the request class in the installer & updater.
[feature/request-class] request_var should return after setting the request object.
[feature/request-class] Instantiate a global request class instance.
[feature/request-class] New request class supports recursive arrays.
...
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 6cc7abf118..2eba85383d 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -205,16 +205,26 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); // Set PHP error handler to ours set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler'); +// Cache must be loaded before class loader +$cache = new cache(); + +// Setup class loader first +$class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx, $cache); +$class_loader->register(); + // Instantiate some basic classes +$request = new phpbb_request(); $user = new user(); $auth = new auth(); $template = new template(); -$cache = new cache(); $db = new $sql_db(); $class_loader = new phpbb_class_loader($phpbb_root_path, '.' . $phpEx, $cache); $class_loader->register(); +// make sure request_var uses this request instance +request_var('', 0, false, false, $request); // "dependency injection" for a function + // Connect to DB $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, defined('PHPBB_DB_NEW_LINK') ? PHPBB_DB_NEW_LINK : false); |