diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-08-15 19:34:30 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-29 15:42:40 +0200 |
| commit | fb943d4d6b39cea9825aab78e397eefe26cf7bdf (patch) | |
| tree | 15120afbd397f7fb8dab83a6173055e18b50f108 | |
| parent | fabde989a2676c762f58e17b06772c9a3ba2f85e (diff) | |
| download | forums-fb943d4d6b39cea9825aab78e397eefe26cf7bdf.tar forums-fb943d4d6b39cea9825aab78e397eefe26cf7bdf.tar.gz forums-fb943d4d6b39cea9825aab78e397eefe26cf7bdf.tar.bz2 forums-fb943d4d6b39cea9825aab78e397eefe26cf7bdf.tar.xz forums-fb943d4d6b39cea9825aab78e397eefe26cf7bdf.zip | |
[feature/extension-manager] Load the extension manager on all pages
PHPBB3-10323
| -rw-r--r-- | phpBB/common.php | 5 | ||||
| -rw-r--r-- | phpBB/download/file.php | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 7ff06e68d7..cc33b29a09 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -124,6 +124,9 @@ $config = new phpbb_config_db($db, $cache->get_driver(), CONFIG_TABLE); set_config(null, null, null, $config); set_config_count(null, null, null, $config); +// load extensions +$phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx", $cache->get_driver()); + $template_locator = new phpbb_template_locator(); $template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $template_locator); @@ -138,5 +141,5 @@ foreach ($cache->obtain_hooks() as $hook) if (!$config['use_system_cron']) { - $cron = new phpbb_cron_manager($phpbb_root_path . 'includes/cron/task', $phpEx, $cache->get_driver()); + $cron = new phpbb_cron_manager($phpbb_extension_manager, $cache->get_driver()); } diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 956af75c81..e13524f922 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -73,6 +73,9 @@ if (isset($_GET['avatar'])) set_config(null, null, null, $config); set_config_count(null, null, null, $config); + // load extensions + $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx", $cache->get_driver()); + $filename = request_var('avatar', ''); $avatar_group = false; $exit = false; |