diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-09 00:16:22 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-09 00:16:22 +0200 |
| commit | dccc0877c1cc34826c5178247a06e8c1ca7702a0 (patch) | |
| tree | eba5471cf1326477bc39a77b7391b6792f8e0cec /phpBB/phpbb | |
| parent | 9d18b3d1eeb1cb755fb7949bad07a7586eef4962 (diff) | |
| parent | 58286171f1035495c8c2a6fdffce9f3842601e66 (diff) | |
| download | forums-dccc0877c1cc34826c5178247a06e8c1ca7702a0.tar forums-dccc0877c1cc34826c5178247a06e8c1ca7702a0.tar.gz forums-dccc0877c1cc34826c5178247a06e8c1ca7702a0.tar.bz2 forums-dccc0877c1cc34826c5178247a06e8c1ca7702a0.tar.xz forums-dccc0877c1cc34826c5178247a06e8c1ca7702a0.zip | |
Merge pull request #3891 from marc1706/ticket/14150
[ticket/14150] Update fast-image-size to newest version
* marc1706/ticket/14150:
[ticket/14150] Update fast-image-size to newest version
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/driver.php | 6 | ||||
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/parser.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php index b6fd380bda..c849533166 100644 --- a/phpBB/phpbb/avatar/driver/driver.php +++ b/phpBB/phpbb/avatar/driver/driver.php @@ -30,7 +30,7 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface */ protected $config; - /** @var \fastImageSize\fastImageSize */ + /** @var \FastImageSize\FastImageSize */ protected $imagesize; /** @@ -76,13 +76,13 @@ 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 \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, \fastImageSize\fastImageSize $imagesize, $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; diff --git a/phpBB/phpbb/textformatter/s9e/parser.php b/phpBB/phpbb/textformatter/s9e/parser.php index 838c211e56..ffaffbc63c 100644 --- a/phpBB/phpbb/textformatter/s9e/parser.php +++ b/phpBB/phpbb/textformatter/s9e/parser.php @@ -370,7 +370,7 @@ class parser implements \phpbb\textformatter\parser_interface if ($max_height || $max_width) { - $imagesize = new \fastImageSize\fastImageSize(); + $imagesize = new \FastImageSize\FastImageSize(); $size_info = $imagesize->getImageSize($url); if ($size_info === false) { |