mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-14 12:44:06 +02:00
Code Issues Releases Wiki Activity

[feature/avatars] Use request object in avatar drivers

Browse Source 
PHPBB3-10018
This commit is contained in:
Igor Wiedler
2012-04-07 19:19:13 +02:00
parent 3b0e0dba32
commit e861bb0e04
9 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/avatar/manager.php
View File

@@ -23,17 +23,19 @@ class phpbb_avatar_manager
private $phpbb_root_path;
private $phpEx;
private $config;
private $request;
private $cache;
private static $valid_drivers = false;
/**
* @TODO
**/
public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_cache_driver_interface $cache = null)
public function __construct($phpbb_root_path, $phpEx, phpbb_config $config, phpbb_request $request, phpbb_cache_driver_interface $cache = null)
{
$this->phpbb_root_path = $phpbb_root_path;
$this->phpEx = $phpEx;
$this->config = $config;
$this->request = $request;
$this->cache = $cache;
}
@@ -66,7 +68,7 @@ class phpbb_avatar_manager
if ($new || !is_object(self::$valid_drivers[$avatar_type]))
{
$class_name = 'phpbb_avatar_driver_' . $avatar_type;
self::$valid_drivers[$avatar_type] = new $class_name($this->config, $this->phpbb_root_path, $this->phpEx, $this->cache);
self::$valid_drivers[$avatar_type] = new $class_name($this->config, $this->request, $this->phpbb_root_path, $this->phpEx, $this->cache);
}
return self::$valid_drivers[$avatar_type];