diff options
| author | David King <imkingdavid@gmail.com> | 2013-08-29 14:25:46 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-08-29 14:25:46 -0700 |
| commit | afc12906b92c2cf126fa2ff9006583d0c4ef01ec (patch) | |
| tree | 0140929b3ddc902fb7f072af2425040d7a43d814 /phpBB/includes/functions_module.php | |
| parent | dcf82d9a5ae26de462687325b4d8553e4aaca7d4 (diff) | |
| parent | aae7677d71112e468b56be7e10d16f3b381fcad7 (diff) | |
| download | forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar.gz forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar.bz2 forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.tar.xz forums-afc12906b92c2cf126fa2ff9006583d0c4ef01ec.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11628' into develop
Diffstat (limited to 'phpBB/includes/functions_module.php')
| -rw-r--r-- | phpBB/includes/functions_module.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 99c24fcb19..8f0f6a837a 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -455,7 +455,7 @@ class p_master */ function load_active($mode = false, $module_url = false, $execute_module = true) { - global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $phpbb_style; + global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $template; $module_path = $this->include_path . $this->p_class; $icat = request_var('icat', ''); @@ -508,7 +508,7 @@ class p_master if (is_dir($module_style_dir)) { - $phpbb_style->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style'), array(), ''); + $template->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style')); } } @@ -537,7 +537,7 @@ class p_master if (is_dir($phpbb_root_path . $module_style_dir)) { - $phpbb_style->set_style(array($module_style_dir, 'styles')); + $template->set_style(array($module_style_dir, 'styles')); } } |