diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-19 15:45:35 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-19 15:45:35 +0200 |
| commit | 15413f43e48b317fda276d0f9bb42d122caacf3c (patch) | |
| tree | d4fd5cbcebf6a8cd557c282c24b259d681f9b54f /phpBB/phpbb | |
| parent | 06e7c842357fd26104efba6b7a0465d7c05c4493 (diff) | |
| download | forums-15413f43e48b317fda276d0f9bb42d122caacf3c.tar forums-15413f43e48b317fda276d0f9bb42d122caacf3c.tar.gz forums-15413f43e48b317fda276d0f9bb42d122caacf3c.tar.bz2 forums-15413f43e48b317fda276d0f9bb42d122caacf3c.tar.xz forums-15413f43e48b317fda276d0f9bb42d122caacf3c.zip | |
[ticket/11700] Correctly handle avatar drivers with namespaces
PHPBB3-11700
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/avatar/manager.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index 0408467064..11f401d9ed 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -222,7 +222,7 @@ class manager */ static public function clean_driver_name($name) { - return str_replace('_', '.', $name); + return str_replace(array('\\', '_'), '.', $name); } /** @@ -235,7 +235,7 @@ class manager */ static public function prepare_driver_name($name) { - return str_replace(array('\\', '.'), '_', $name); + return str_replace('.', '_', $name); } /** @@ -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)); } /** |