diff options
| author | patdenice <patdenice@piwigo.org> | 2013-03-22 09:24:18 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2013-03-22 09:24:18 +0000 |
| commit | f984751375fa7ddd9a4ffeeed609727d534136aa (patch) | |
| tree | b57b79077c6f3ade335578141177f150c2e1c9d1 /themes | |
| parent | dbd08fead81d8ee2bbbe64b23010bc8eaf3fed31 (diff) | |
merge r21779 from trunk to branch 2.5
Correct image size in smartpocket with GThumb+ activated
git-svn-id: http://piwigo.org/svn/branches/2.5@21780 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/smartpocket/themeconf.inc.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/themes/smartpocket/themeconf.inc.php b/themes/smartpocket/themeconf.inc.php index 7a13d9698..3ab554fff 100644 --- a/themes/smartpocket/themeconf.inc.php +++ b/themes/smartpocket/themeconf.inc.php @@ -38,22 +38,21 @@ function sp_select_all_categories($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));
?>
|