diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-04 15:21:57 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-04 15:21:57 -0500 |
| commit | 53496e6a473f1e5563f733365cbeaf275c2fd0af (patch) | |
| tree | f5fe29de8046958c65c3d170b3566d7c0d47f88b /phpBB/includes/functions_module.php | |
| parent | 38700a80f805ae32632d88254e714699b8435f61 (diff) | |
| download | forums-53496e6a473f1e5563f733365cbeaf275c2fd0af.tar forums-53496e6a473f1e5563f733365cbeaf275c2fd0af.tar.gz forums-53496e6a473f1e5563f733365cbeaf275c2fd0af.tar.bz2 forums-53496e6a473f1e5563f733365cbeaf275c2fd0af.tar.xz forums-53496e6a473f1e5563f733365cbeaf275c2fd0af.zip | |
[feature/twig] acp module tpls are in ext/adm, ucp/mcp in styles/
PHPBB3-11598
Diffstat (limited to 'phpBB/includes/functions_module.php')
| -rw-r--r-- | phpBB/includes/functions_module.php | 52 |
1 files changed, 35 insertions, 17 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 85ff41500f..df0327db0f 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, $style; + global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $phpbb_style; $module_path = $this->include_path . $this->p_class; $icat = request_var('icat', ''); @@ -491,27 +491,27 @@ class p_master $this->module = new $class_name($this); - /* - * If this is an extension module, we'll try to automatically set - * the style paths for the extension (the ext author can change them - * if necessary). - */ - $module_dir = explode('_', get_class($this->module)); - - // 0 phpbb, 1 ext, 2 vendor, 3 extension name, ... - if (isset($module_dir[3]) && $module_dir[1] === 'ext') + // We pre-define the action parameter we are using all over the place + if (defined('IN_ADMIN')) { - $module_style_dir = 'ext/' . $module_dir[2] . '/' . $module_dir[3] . '/styles'; + /* + * If this is an extension module, we'll try to automatically set + * the style paths for the extension (the ext author can change them + * if necessary). + */ + $module_dir = explode('_', get_class($this->module)); - if (is_dir($module_style_dir)) + // 0 phpbb, 1 ext, 2 vendor, 3 extension name, ... + if (isset($module_dir[3]) && $module_dir[1] === 'ext') { - $style->set_style(array($module_style_dir, 'styles')); + $module_style_dir = $phpbb_root_path .'ext/' . $module_dir[2] . '/' . $module_dir[3] . '/adm/style'; + + if (is_dir($module_style_dir)) + { + $phpbb_style->set_custom_style('admin', array($module_style_dir, $phpbb_admin_path . 'style'), array(), ''); + } } - } - // We pre-define the action parameter we are using all over the place - if (defined('IN_ADMIN')) - { // Is first module automatically enabled a duplicate and the category not passed yet? if (!$icat && $this->module_ary[$this->active_module_row_id]['is_duplicate']) { @@ -523,6 +523,24 @@ class p_master } else { + /* + * If this is an extension module, we'll try to automatically set + * the style paths for the extension (the ext author can change them + * if necessary). + */ + $module_dir = explode('_', get_class($this->module)); + + // 0 phpbb, 1 ext, 2 vendor, 3 extension name, ... + if (isset($module_dir[3]) && $module_dir[1] === 'ext') + { + $module_style_dir = 'ext/' . $module_dir[2] . '/' . $module_dir[3] . '/styles'; + + if (is_dir($phpbb_root_path . $module_style_dir)) + { + $phpbb_style->set_style(array($module_style_dir, 'styles')); + } + } + // If user specified the module url we will use it... if ($module_url !== false) { |