diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-28 00:23:52 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-28 00:23:52 +0200 |
| commit | cf12e179441f0ae247be3fd448a4d7fb16e089ec (patch) | |
| tree | df9f4c540aa4013002720079d9952d08021d8131 /phpBB/includes/functions_module.php | |
| parent | 317ce7b0c7d929fe4b51dce0441ff2752adc0976 (diff) | |
| parent | 08c01b7cee629701dc62b32b03eb5543e8c9d196 (diff) | |
| download | forums-cf12e179441f0ae247be3fd448a4d7fb16e089ec.tar forums-cf12e179441f0ae247be3fd448a4d7fb16e089ec.tar.gz forums-cf12e179441f0ae247be3fd448a4d7fb16e089ec.tar.bz2 forums-cf12e179441f0ae247be3fd448a4d7fb16e089ec.tar.xz forums-cf12e179441f0ae247be3fd448a4d7fb16e089ec.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12509] Add example in doc block
[ticket/12509] Add missing ',' in arrays
[ticket/12509] Update calls to set_custom_style in forgotten places
[ticket/12509] Fix path in adm/index.php
[ticket/12509] Fix typo in adm/index.php
[ticket/12509] Fix doc block
[ticket/12509] Fix the call to set_custom_file in adm/index and messenger
[ticket/12509] Update acp custom_style setter
[ticket/12509] Add an option to set the path of custom file for extensions
Diffstat (limited to 'phpBB/includes/functions_module.php')
| -rw-r--r-- | phpBB/includes/functions_module.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 04efcb7b2e..86d3a3a077 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -581,7 +581,12 @@ class p_master if (is_dir($module_style_dir)) { - $template->set_custom_style('adm', array($module_style_dir, $phpbb_admin_path . 'style')); + $template->set_custom_style(array( + array( + 'name' => 'adm', + 'ext_path' => 'adm/style/', + ), + ), array($module_style_dir, $phpbb_admin_path . 'style')); } } |