archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r21779 from trunk to branch 2.4

Browse source 
Correct image size in smartpocket with GThumb+ activated

git-svn-id: http://piwigo.org/svn/branches/2.4@21781 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice 2013-03-22 09:25:01 +00:00
parent 1a7dd9aa63
commit 24faf8ab69
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
themes/smartpocket/themeconf.inc.php
View file

@ -29,22 +29,21 @@ function sp_select_all_thumbnails($selection)
}
// Get better derive parameters for screen size
$type = IMG_LARGE;
if (!empty($_COOKIE['screen_size']))
{
$screen_size = explode('x', $_COOKIE['screen_size']);
$derivative_params = new ImageStdParams;
$derivative_params->load_from_db();
$type = IMG_LARGE;
foreach ($derivative_params->get_all_type_map() as $type => $map)
{
if (max($map->sizing->ideal_size) >= max($screen_size) and min($map->sizing->ideal_size) >= min($screen_size))
break;
}
pwg_set_session_var('sp_picture_deriv', $type);
}
$this->assign('picture_derivative_params', ImageStdParams::get_by_type(pwg_get_session_var('sp_picture_deriv', IMG_LARGE)));
$this->assign('picture_derivative_params', ImageStdParams::get_by_type($type));
$this->assign('thumbnail_derivative_params', ImageStdParams::get_by_type(IMG_SQUARE));
?>