mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Fixed " Image_Backend interface constructor needs updating (master) #3477 " on both the Image_Backend Model and Imagick_Backend filesystem class
This commit is contained in:
parent
a4d4d0273b
commit
0223b6164c
@ -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);
|
||||||
|
@ -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);
|
||||||
}
|
}
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user