wpstudio/image
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of dimti.ru:lib/Image

Browse Source
This commit is contained in:
Alexander Demidov
2014-05-07 21:53:37 +04:00
parent 9362005000 fcde140a57
commit 1fa48b9b15
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,6 +1,11 @@
Changelog Changelog
========= =========
0.0.21 (2014-05-07)
-------------------
- Merge branch 'master' of dimti.ru:lib/Image. [Alexander Demidov]
0.0.20 (2014-05-07) 0.0.20 (2014-05-07)
------------------- -------------------

4
Upload.class.php
View File

@ -11,7 +11,9 @@ abstract class Upload
public static function &getGreagwarImage($file_path) public static function &getGreagwarImage($file_path)
{ {
$greagwar_image = new GreagwarImage($file_path); $greagwar_image = new GreagwarImage($file_path);
$greagwar_image->setCacheDir(Config::get('PATH_WEB_ROOT') . DIRECTORY_SEPARATOR . self::$dir_image_cache); $config_upload = Config::get('Upload');
$dir_image_cache = $config_upload ? $config_upload->dir_image_cache : self::$dir_image_cache;
$greagwar_image->setCacheDir(Config::get('PATH_WEB_ROOT') . DIRECTORY_SEPARATOR . $dir_image_cache);
return $greagwar_image; return $greagwar_image;
} }