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

This commit is contained in:
2014-05-07 21:53:37 +04:00
2 changed files with 8 additions and 1 deletions

View File

@ -11,7 +11,9 @@ abstract class Upload
public static function &getGreagwarImage($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;
}