Changeset 21781 for branches/2.4

Timestamp:

Mar 22, 2013, 10:25:01 AM (11 years ago)

Author:

patdenice

Message:

merge r21779 from trunk to branch 2.4
Correct image size in smartpocket with GThumb+ activated

File:

• branches/2.4/themes/smartpocket/themeconf.inc.php (modified) (3 diffs)

branches/2.4/themes/smartpocket/themeconf.inc.php

@@ -30 +30 @@
 
 // Get better derive parameters for screen size
+$type = IMG_LARGE;
 if (!empty($_COOKIE['screen_size']))
 {
@@ -35 +36 @@
   $derivative_params = new ImageStdParams;
   $derivative_params->load_from_db();
-  $type = IMG_LARGE;
 
   foreach ($derivative_params->get_all_type_map() as $type => $map)
@@ -42 +42 @@
       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));