tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3879 from AdenFraser/Issue3477

Browse Source 
Fixed "Image_Backend interface constructor needs updating (master) #3477"
This commit is contained in:
Loz Calver 2015-02-11 16:33:06 +00:00
commit 3b5a7c22b3
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
filesystem/GD.php
View File

@ -35,6 +35,13 @@ class GDBackend extends Object implements Image_Backend {
} }
} }
/**
* __construct
*
* @param string $filename = null
* @param array $args = array()
* @return void
*/
public function __construct($filename = null, $args = array()) { public function __construct($filename = null, $args = array()) {
// If we're working with image resampling, things could take a while. Bump up the time-limit // If we're working with image resampling, things could take a while. Bump up the time-limit
increase_time_limit_to(300); increase_time_limit_to(300);

3
filesystem/ImagickBackend.php
View File

@ -18,9 +18,10 @@ class ImagickBackend extends Imagick implements Image_Backend {
* __construct * __construct
* *
* @param string $filename = null * @param string $filename = null
* @param array $args = array()
* @return void * @return void
*/ */
public function __construct($filename = null) { public function __construct($filename = null, $args = array()) {
if(is_string($filename)) { if(is_string($filename)) {
parent::__construct($filename); parent::__construct($filename);
} }

3
model/Image_Backend.php
View File

@ -13,9 +13,10 @@ interface Image_Backend {
* __construct * __construct
* *
* @param string $filename = null * @param string $filename = null
* @param array $args = array()
* @return void * @return void
*/ */
public function __construct($filename = null); public function __construct($filename = null, $args = array());
/** /**
* writeTo * writeTo