aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_module.php
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2013-12-12 10:28:10 -0800
committerMatt Friedman <maf675@gmail.com>2013-12-12 10:28:10 -0800
commita59bbeed2dd82b316f1e2f9ad484b978ef2a541c (patch)
treef3d667b7711b44fa56f6d575b8ae2bc072682d23 /phpBB/includes/functions_module.php
parent2ae6f216f66466a1851f52cbc9839e3405525981 (diff)
parentda6ced59d9632fec5103ce4bea86eb6bcceb5d1e (diff)
downloadforums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.tar
forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.tar.gz
forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.tar.bz2
forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.tar.xz
forums-a59bbeed2dd82b316f1e2f9ad484b978ef2a541c.zip
[ticket/11966] Merge branch 'develop' into ticket/11966
PHPBB3-11966
Diffstat (limited to 'phpBB/includes/functions_module.php')
-rw-r--r--phpBB/includes/functions_module.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index dca720c36e..e1259eba12 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -528,12 +528,12 @@ class p_master
* the style paths for the extension (the ext author can change them
* if necessary).
*/
- $module_dir = explode('_', get_class($this->module));
+ $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')
+ // 0 vendor, 1 extension name, ...
+ if (isset($module_dir[1]))
{
- $module_style_dir = 'ext/' . $module_dir[2] . '/' . $module_dir[3] . '/styles';
+ $module_style_dir = 'ext/' . $module_dir[0] . '/' . $module_dir[1] . '/styles';
if (is_dir($phpbb_root_path . $module_style_dir))
{