aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-03-26 04:07:03 +0000
committerrvelices <rv-github@modusoptimus.com>2012-03-26 04:07:03 +0000
commit9d66c18541edd35e69e0acb739d9c4def2b4bf5e (patch)
tree94b35a512999e1783d52ed9b4a1071b4dc015990 /include
parentc537b5144f2f0b8be300dd76d3388a4232d85951 (diff)
- 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
Diffstat (limited to '')
-rw-r--r--include/derivative_std_params.inc.php20
1 files changed, 0 insertions, 20 deletions
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()