diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-10-21 11:04:23 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-21 11:04:23 +0200 |
| commit | ba5b53521a186dc23d6d4b849c7f76196c783d43 (patch) | |
| tree | 0881bc85252172f371c3d1112f4a3e53ca781551 /phpBB/phpbb/avatar/driver/driver.php | |
| parent | 4649155f415310a67be409ff15a3140accbae799 (diff) | |
| parent | a80d5c93e354aa1e4dff548a89129ccd7f5488ee (diff) | |
| download | forums-ba5b53521a186dc23d6d4b849c7f76196c783d43.tar forums-ba5b53521a186dc23d6d4b849c7f76196c783d43.tar.gz forums-ba5b53521a186dc23d6d4b849c7f76196c783d43.tar.bz2 forums-ba5b53521a186dc23d6d4b849c7f76196c783d43.tar.xz forums-ba5b53521a186dc23d6d4b849c7f76196c783d43.zip | |
Merge remote-tracking branch 'marc1706/ticket/11930' into develop
* marc1706/ticket/11930:
[ticket/11930] Update docblock of avatar driver constructor
[ticket/11930] Modify order of properties to fit constructor method
[ticket/11930] Move path_helper in front of optional cache argument
[ticket/11930] Fix tests after adding phpbb\path_helper to avatar drivers
[ticket/11930] Use \phpbb\path_helper for avatar URLs
Diffstat (limited to 'phpBB/phpbb/avatar/driver/driver.php')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/driver.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php index 0c54951cbd..206df86543 100644 --- a/phpBB/phpbb/avatar/driver/driver.php +++ b/phpBB/phpbb/avatar/driver/driver.php @@ -48,6 +48,12 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface protected $php_ext; /** + * Path Helper + * @var \phpbb\path_helper + */ + protected $path_helper; + + /** * Cache driver * @var \phpbb\cache\driver\driver_interface */ @@ -75,13 +81,15 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface * @param \phpbb\request\request $request Request object * @param string $phpbb_root_path Path to the phpBB root * @param string $php_ext PHP file extension + * @param \phpbb_path_helper $path_helper phpBB path helper * @param \phpbb\cache\driver\driver_interface $cache Cache driver */ - public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\cache\driver\driver_interface $cache = null) + public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\path_helper $path_helper, \phpbb\cache\driver\driver_interface $cache = null) { $this->config = $config; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; + $this->path_helper = $path_helper; $this->cache = $cache; } |