From 0223b6164cb661e71dd8d84485e7209d6685a340 Mon Sep 17 00:00:00 2001 From: Aden Fraser Date: Wed, 11 Feb 2015 15:58:47 +0000 Subject: [PATCH] Fixed " Image_Backend interface constructor needs updating (master) #3477 " on both the Image_Backend Model and Imagick_Backend filesystem class --- filesystem/GD.php | 7 +++++++ filesystem/ImagickBackend.php | 3 ++- model/Image_Backend.php | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/filesystem/GD.php b/filesystem/GD.php index 8ca8c9569d8..6869a6f79a8 100644 --- a/filesystem/GD.php +++ b/filesystem/GD.php @@ -35,6 +35,13 @@ public static function set_default_quality($quality) { } } + /** + * __construct + * + * @param string $filename = null + * @param array $args = array() + * @return void + */ public function __construct($filename = null, $args = array()) { // If we're working with image resampling, things could take a while. Bump up the time-limit increase_time_limit_to(300); diff --git a/filesystem/ImagickBackend.php b/filesystem/ImagickBackend.php index 1f5309cefcb..17acff09a0f 100644 --- a/filesystem/ImagickBackend.php +++ b/filesystem/ImagickBackend.php @@ -18,9 +18,10 @@ class ImagickBackend extends Imagick implements Image_Backend { * __construct * * @param string $filename = null + * @param array $args = array() * @return void */ - public function __construct($filename = null) { + public function __construct($filename = null, $args = array()) { if(is_string($filename)) { parent::__construct($filename); } diff --git a/model/Image_Backend.php b/model/Image_Backend.php index 919a916f290..e63df2daaa4 100644 --- a/model/Image_Backend.php +++ b/model/Image_Backend.php @@ -13,9 +13,10 @@ interface Image_Backend { * __construct * * @param string $filename = null + * @param array $args = array() * @return void */ - public function __construct($filename = null); + public function __construct($filename = null, $args = array()); /** * writeTo