[ticket/11700] Correctly handle avatar drivers with namespaces

PHPBB3-11700
This commit is contained in:
Nils Adermann 2013-09-19 15:45:35 +02:00
parent 06e7c84235
commit 15413f43e4

View file

@ -222,7 +222,7 @@ class manager
*/ */
static public function clean_driver_name($name) 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) 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) 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));
} }
/** /**