Changeset 21780 for branches


Ignore:
Timestamp:
Mar 22, 2013, 10:24:18 AM (8 years ago)
Author:
patdenice
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.5/themes/smartpocket/themeconf.inc.php

    r21098 r21780  
    3939
    4040// Get better derive parameters for screen size
     41$type = IMG_LARGE;
    4142if (!empty($_COOKIE['screen_size']))
    4243{
     
    4445  $derivative_params = new ImageStdParams;
    4546  $derivative_params->load_from_db();
    46   $type = IMG_LARGE;
    4747
    4848  foreach ($derivative_params->get_all_type_map() as $type => $map)
     
    5151      break;
    5252  }
    53   pwg_set_session_var('sp_picture_deriv', $type);
    5453}
    5554
    56 $this->assign('picture_derivative_params', ImageStdParams::get_by_type(pwg_get_session_var('sp_picture_deriv', IMG_LARGE)));
     55$this->assign('picture_derivative_params', ImageStdParams::get_by_type($type));
    5756$this->assign('thumbnail_derivative_params', ImageStdParams::get_by_type(IMG_SQUARE));
    5857
Note: See TracChangeset for help on using the changeset viewer.