diff options
| author | David King <imkingdavid@gmail.com> | 2013-07-11 20:43:41 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-07-11 20:43:41 -0400 |
| commit | 8b7aef6f938bf7c08d41908e78b6e71117adba38 (patch) | |
| tree | d39d9f3720e4afe78d23772e15830a2b12f1f5ba /phpBB/includes/functions_module.php | |
| parent | b9c290b5480a958eabeef66d5e9af799f77e4566 (diff) | |
| parent | b1d3c1bf6990c8105c18eb9db06ebf9c974b0899 (diff) | |
| download | forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.tar forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.tar.gz forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.tar.bz2 forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.tar.xz forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.zip | |
Merge branch 'develop' into ticket/11215
* develop: (176 commits)
[feature/bootstrap-dic] Bootstrap container from config.php
[ticket/11548] Use new static methods for request and submit
[ticket/10772] Updating tests
[ticket/10772] Remove 3.1 code
[ticket/11388] Add newlines at EOF
[ticket/11388] INCLUDECSS
[ticket/11548] Run array_map on complete error array and not just colour_error
[ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
[ticket/11388] Do not append assets_version if using remote path (e.g. http)
[ticket/11388] Fix typo
[ticket/11388] Remove typehints (causing tests to fail)
[ticket/11388] Disable cache if IN_INSTALL defined
[ticket/11388] Do not modify by reference
[ticket/11388] typehits
[ticket/11388] INCLUDEJS test for //(url)
[ticket/11388] INCLUDEJS supports //(url)
[ticket/11388] Fixing includejs test
[ticket/11388] includejs inherit from includeasset
[feature/twig] Unit tests for includejs
[ticket/8319] Add migration file for update change
...
Diffstat (limited to 'phpBB/includes/functions_module.php')
| -rw-r--r-- | phpBB/includes/functions_module.php | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 0d387ace6d..99c24fcb19 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; + global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $phpbb_style; $module_path = $this->include_path . $this->p_class; $icat = request_var('icat', ''); @@ -494,6 +494,24 @@ class p_master // We pre-define the action parameter we are using all over the place if (defined('IN_ADMIN')) { + /* + * 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 = $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(), ''); + } + } + // 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']) { @@ -505,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) { |