From 24faf8ab696dde1896adfc5ca8b0b3c92079f6c2 Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Fri, 22 Mar 2013 09:25:01 +0000
Subject: merge r21779 from trunk to branch 2.4 Correct image size in
 smartpocket with GThumb+ activated

git-svn-id: http://piwigo.org/svn/branches/2.4@21781 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 themes/smartpocket/themeconf.inc.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'themes/smartpocket/themeconf.inc.php')

diff --git a/themes/smartpocket/themeconf.inc.php b/themes/smartpocket/themeconf.inc.php
index 0c5f7397d..b1f2d50e7 100644
--- a/themes/smartpocket/themeconf.inc.php
+++ b/themes/smartpocket/themeconf.inc.php
@@ -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));
 
 ?>
-- 
cgit v1.2.3