mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-26 19:29:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

- small js fixes on index/picture

Browse source 
- 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
This commit is contained in:
rvelices 2012-03-26 04:07:03 +00:00
parent c537b5144f
commit 9d66c18541
6 changed files with 27 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

20
include/derivative_std_params.inc.php
View file

@ -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()