diff options
| author | Yuriy Rusko <github@rusko.net> | 2014-05-28 01:02:39 +0200 |
|---|---|---|
| committer | Yuriy Rusko <github@rusko.net> | 2014-05-28 01:02:39 +0200 |
| commit | 2a42aee8acfcab79b0dd43572b9da2c4dd8a288a (patch) | |
| tree | 50400df541c6ac30ecf894830012b7a7c28b45fc /phpBB/includes/functions_module.php | |
| parent | 1d61bcedfd1882f84d102c523a354a8c4ae69336 (diff) | |
| parent | 08c01b7cee629701dc62b32b03eb5543e8c9d196 (diff) | |
| download | forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar.gz forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar.bz2 forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.tar.xz forums-2a42aee8acfcab79b0dd43572b9da2c4dd8a288a.zip | |
Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594
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 5d456e6355..51284af233 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -584,7 +584,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')); } } |