diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-19 16:21:38 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-19 16:21:38 +0200 |
| commit | 40ea7422b12b618cf7eecc01868b462eaed462a9 (patch) | |
| tree | c5a7b921b184c95d4fb534b565685a166fcbb315 /phpBB | |
| parent | 733020f5f91435f430af2d94843258cf37ecc749 (diff) | |
| download | forums-40ea7422b12b618cf7eecc01868b462eaed462a9.tar forums-40ea7422b12b618cf7eecc01868b462eaed462a9.tar.gz forums-40ea7422b12b618cf7eecc01868b462eaed462a9.tar.bz2 forums-40ea7422b12b618cf7eecc01868b462eaed462a9.tar.xz forums-40ea7422b12b618cf7eecc01868b462eaed462a9.zip | |
[ticket/11700] Correctly load avatar templates for namespaced drivers
PHPBB3-11700
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/driver.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/avatar/manager.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php index d688e7d70c..0c54951cbd 100644 --- a/phpBB/phpbb/avatar/driver/driver.php +++ b/phpBB/phpbb/avatar/driver/driver.php @@ -114,7 +114,7 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface */ public function get_template_name() { - $driver = preg_replace('#^phpbb_avatar_driver_#', '', get_class($this)); + $driver = preg_replace('#^phpbb\\\\avatar\\\\driver\\\\#', '', get_class($this)); $template = "ucp_avatar_options_$driver.html"; return $template; diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index 11f401d9ed..c28380a401 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -277,7 +277,7 @@ class manager */ public function get_driver_config_name($driver) { - return preg_replace('#^phpbb\\avatar\\driver\\\\#', '', get_class($driver)); + return preg_replace('#^phpbb\\\\avatar\\\\driver\\\\#', '', get_class($driver)); } /** |