diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-04-09 00:35:51 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-04-09 00:35:51 +0200 |
| commit | e57e82d478feccc3a995b71118663e7f65c02ea7 (patch) | |
| tree | f4ede5ef46c0ffa2e12c1925849d73e8cfc34dcd /phpBB/common.php | |
| parent | 26e7dd98b71655c7e09be02ebd3ef84765ce27b8 (diff) | |
| parent | 57065095d570f0ff5976470ce81a4b216fe5f98e (diff) | |
| download | forums-e57e82d478feccc3a995b71118663e7f65c02ea7.tar forums-e57e82d478feccc3a995b71118663e7f65c02ea7.tar.gz forums-e57e82d478feccc3a995b71118663e7f65c02ea7.tar.bz2 forums-e57e82d478feccc3a995b71118663e7f65c02ea7.tar.xz forums-e57e82d478feccc3a995b71118663e7f65c02ea7.zip | |
Merge remote-tracking branch 'github-cyberalien/ticket/10754' into develop
* github-cyberalien/ticket/10754:
[ticket/10754] Changing $style to $phpbb_style
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index b3b8d7e4f7..a00e3e82a8 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -125,7 +125,7 @@ $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_ro $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_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(); |