From 9d66c18541edd35e69e0acb739d9c4def2b4bf5e Mon Sep 17 00:00:00 2001 From: rvelices Date: Mon, 26 Mar 2012 04:07:03 +0000 Subject: - small js fixes on index/picture - i.php does not use derivatives.dat file anymore (obsolete file) - better selection of derivatives in picture.php - larger sharpen real range in image.class.php git-svn-id: http://piwigo.org/svn/trunk@13736 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/derivative_std_params.inc.php | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'include/derivative_std_params.inc.php') diff --git a/include/derivative_std_params.inc.php b/include/derivative_std_params.inc.php index c04daaf1f..06365e822 100644 --- a/include/derivative_std_params.inc.php +++ b/include/derivative_std_params.inc.php @@ -117,25 +117,6 @@ final class ImageStdParams self::build_maps(); } - static function load_from_file() - { - global $conf; - $arr = @unserialize(@file_get_contents(PHPWG_ROOT_PATH.$conf['data_location'].'derivatives.dat')); - if (false!==$arr) - { - self::$type_map = $arr['d']; - self::$watermark = @$arr['w']; - if (!self::$watermark) self::$watermark = new WatermarkParams(); - self::$custom = @$arr['c']; - if (!self::$custom) self::$custom = array(); - } - else - { - self::make_default(); - } - self::build_maps(); - } - static function set_watermark($watermark) { self::$watermark = $watermark; @@ -158,7 +139,6 @@ final class ImageStdParams 'c' => self::$custom, ) ); conf_update_param('derivatives', addslashes($ser) ); - file_put_contents(PHPWG_ROOT_PATH.$conf['data_location'].'derivatives.dat', $ser); } private static function make_default() -- cgit v1.2.3