diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-19 18:29:08 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-19 18:29:08 +0200 |
| commit | fe36375a36ec4f816eb07b41630b6c9fa7ff12c8 (patch) | |
| tree | 96e1122b07586d8802601fcfeea7d45b398b5e08 /phpBB/phpbb/controller | |
| parent | f205c4fad4c3a82cc4a47beb7f9a8025669a3acb (diff) | |
| download | forums-fe36375a36ec4f816eb07b41630b6c9fa7ff12c8.tar forums-fe36375a36ec4f816eb07b41630b6c9fa7ff12c8.tar.gz forums-fe36375a36ec4f816eb07b41630b6c9fa7ff12c8.tar.bz2 forums-fe36375a36ec4f816eb07b41630b6c9fa7ff12c8.tar.xz forums-fe36375a36ec4f816eb07b41630b6c9fa7ff12c8.zip | |
[ticket/11700] Fix extension loading with namespaces
class loader now expects all classes to be prefixed with a backslash
when resolving paths
PHPBB3-11700
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/controller/resolver.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 6e45374643..07483a91eb 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -91,7 +91,7 @@ class helper page_footer(true, false, false); - return new \Response($this->template->assign_display('body'), $status_code); + return new Response($this->template->assign_display('body'), $status_code); } /** diff --git a/phpBB/phpbb/controller/resolver.php b/phpBB/phpbb/controller/resolver.php index dad2ebd06b..1cc8981105 100644 --- a/phpBB/phpbb/controller/resolver.php +++ b/phpBB/phpbb/controller/resolver.php @@ -95,12 +95,12 @@ class resolver implements ControllerResolverInterface * the style paths for the extension (the ext author can change them * if necessary). */ - $controller_dir = explode('_', get_class($controller_object)); + $controller_dir = explode('\\', get_class($controller_object)); - // 0 phpbb, 1 ext, 2 vendor, 3 extension name, ... - if (!is_null($this->template) && isset($controller_dir[3]) && $controller_dir[1] === 'ext') + // 0 vendor, 1 extension name, ... + if (!is_null($this->template) && isset($controller_dir[1])) { - $controller_style_dir = 'ext/' . $controller_dir[2] . '/' . $controller_dir[3] . '/styles'; + $controller_style_dir = 'ext/' . $controller_dir[0] . '/' . $controller_dir[1] . '/styles'; if (is_dir($controller_style_dir)) { |