php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-13 20:59:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:yiisoft/yii2

Browse Source
This commit is contained in:
Klimov Paul
2014-01-01 23:51:59 +02:00
parent a4f8ce6b53 4a11e6f2ee
commit 00b403fcc2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/yii/imagine/BaseImage.php
View File

@@ -59,10 +59,10 @@ class BaseImage
*/
public static function getImagine()
{
if (static::$_imagine === null) {
static::$_imagine = static::createImagine();
if (self::$_imagine === null) {
self::$_imagine = static::createImagine();
}
return static::$_imagine;
return self::$_imagine;
}
/**
@@ -70,7 +70,7 @@ class BaseImage
*/
public static function setImagine($imagine)
{
static::$_imagine = $imagine;
self::$_imagine = $imagine;
}
/**
@@ -88,12 +88,12 @@ class BaseImage
}
break;
case self::DRIVER_IMAGICK:
if (!class_exists('Imagick', false)) {
if (class_exists('Imagick', false)) {
return new \Imagine\Imagick\Imagine();
}
break;
case self::DRIVER_GD2:
if (!function_exists('gd_info')) {
if (function_exists('gd_info')) {
return new \Imagine\Gd\Imagine();
}
break;