diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 17:22:54 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-31 17:22:54 +0200 |
| commit | 0ae491c5fa9228304e17431ea7aa8ba9303cc193 (patch) | |
| tree | 9d3fcccb13d8bda12ae7f0dec3321c7375d8e621 /phpBB/common.php | |
| parent | e7a4437c1bccace4a0637241a8f386e686d9c3fb (diff) | |
| parent | 5d07b16ec647f51d51504cf9d6a0861a975ceb8e (diff) | |
| download | forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.tar forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.tar.gz forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.tar.bz2 forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.tar.xz forums-0ae491c5fa9228304e17431ea7aa8ba9303cc193.zip | |
Merge remote-tracking branch 'cyberalien/feature/merging-style-components' into develop
* cyberalien/feature/merging-style-components: (31 commits)
[feature/merging-style-components] Fix back link on install page
[feature/merging-style-components] Fix for unit tests
[feature/merging-style-components] Moving template initialization out of style
[feature/merging-style-components] Renaming "delete" to "uninstall" for styles
[feature/merging-style-components] Initializing locator and provider separately
[feature/merging-style-components] Fixing few errors in acp_styles
[feature/merging-style-components] Fix notices in acp_styles
[feature/merging-style-components] Updating styles in coding guidelines
[feature/merging-style-components] Changing acp_styles text
[feature/merging-style-components] Updating test cases
[feature/merging-style-components] Updating style initialization
[feature/merging-style-components] Changing style class
[feature/merging-style-components] Changing template class
[feature/merging-style-components] Changing resource locator
[feature/merging-style-components] Changing path provider
[feature/merging-style-components] Renaming style locator
[feature/merging-style-components] Changing $style to $style_id
[feature/merging-style-components] Creating style class
[feature/merging-style-components] New acp_styles template
[feature/merging-style-components] New acp_styles
...
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 129f7e4881..c11d39d9a1 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -123,9 +123,11 @@ 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()); -$phpbb_template_locator = new phpbb_template_locator(); -$phpbb_template_path_provider = new phpbb_template_extension_path_provider($phpbb_extension_manager, new phpbb_template_path_provider()); -$template = new phpbb_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_template_locator, $phpbb_template_path_provider); +// Initialize style +$phpbb_style_resource_locator = new phpbb_style_resource_locator(); +$phpbb_style_path_provider = new phpbb_style_extension_path_provider($phpbb_extension_manager, new phpbb_style_path_provider()); +$template = new phpbb_style_template($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider); +$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_style_resource_locator, $phpbb_style_path_provider, $template); $phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager); $phpbb_subscriber_loader->load(); |