mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 19:24:01 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3891 from marc1706/ticket/14150

Browse Source 
[ticket/14150] Update fast-image-size to newest version

* marc1706/ticket/14150:
  [ticket/14150] Update fast-image-size to newest version
This commit is contained in:
Tristan Darricau
2015-09-09 00:16:22 +02:00
parent 9d18b3d1ee 58286171f1
commit dccc0877c1
9 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/avatar/driver/driver.php
View File

@@ -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;

2
phpBB/phpbb/textformatter/s9e/parser.php
View File

@@ -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)
{