Changeset 21781


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

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

File:
1 edited

Legend:

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

    r17022 r21781  
    3030
    3131// Get better derive parameters for screen size
     32$type = IMG_LARGE;
    3233if (!empty($_COOKIE['screen_size']))
    3334{
     
    3536  $derivative_params = new ImageStdParams;
    3637  $derivative_params->load_from_db();
    37   $type = IMG_LARGE;
    3838
    3939  foreach ($derivative_params->get_all_type_map() as $type => $map)
     
    4242      break;
    4343  }
    44   pwg_set_session_var('sp_picture_deriv', $type);
    4544}
    4645
    47 $this->assign('picture_derivative_params', ImageStdParams::get_by_type(pwg_get_session_var('sp_picture_deriv', IMG_LARGE)));
     46$this->assign('picture_derivative_params', ImageStdParams::get_by_type($type));
    4847$this->assign('thumbnail_derivative_params', ImageStdParams::get_by_type(IMG_SQUARE));
    4948
Note: See TracChangeset for help on using the changeset viewer.