diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-27 16:26:40 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-27 16:26:40 +0200 |
| commit | 734b89e75cdb02ae436b03d3247cfa820e03f42c (patch) | |
| tree | 8d348e342bce8db60211ec63deed795c7e5df64e /phpBB/phpbb/avatar/driver/driver.php | |
| parent | e7d297740117e644be18e2b9793471da5697c879 (diff) | |
| parent | 9088f448633ff42d767afac674324d1e26911ab6 (diff) | |
| download | forums-734b89e75cdb02ae436b03d3247cfa820e03f42c.tar forums-734b89e75cdb02ae436b03d3247cfa820e03f42c.tar.gz forums-734b89e75cdb02ae436b03d3247cfa820e03f42c.tar.bz2 forums-734b89e75cdb02ae436b03d3247cfa820e03f42c.tar.xz forums-734b89e75cdb02ae436b03d3247cfa820e03f42c.zip | |
Merge pull request #3524 from marc1706/ticket/8672
[ticket/8672] Add class for retrieving imagesize without download
Diffstat (limited to 'phpBB/phpbb/avatar/driver/driver.php')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/driver.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php index b3ced7edf7..b6fd380bda 100644 --- a/phpBB/phpbb/avatar/driver/driver.php +++ b/phpBB/phpbb/avatar/driver/driver.php @@ -30,6 +30,9 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface */ protected $config; + /** @var \fastImageSize\fastImageSize */ + protected $imagesize; + /** * Current $phpbb_root_path * @var string @@ -73,14 +76,16 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface * Construct a driver object * * @param \phpbb\config\config $config phpBB configuration + * @param \fastImageSize\fastImageSize $imagesize fastImageSize class * @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\path_helper $path_helper, \phpbb\cache\driver\driver_interface $cache = null) + public function __construct(\phpbb\config\config $config, \fastImageSize\fastImageSize $imagesize, $phpbb_root_path, $php_ext, \phpbb\path_helper $path_helper, \phpbb\cache\driver\driver_interface $cache = null) { $this->config = $config; + $this->imagesize = $imagesize; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; $this->path_helper = $path_helper; |