diff options
| author | rvelices <rv-github@modusoptimus.com> | 2012-07-24 20:48:44 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2012-07-24 20:48:44 +0000 |
| commit | 0bb3361cf1594d620bf82c4ac398a8340419ae1a (patch) | |
| tree | eaf8e7a4c953139bf234445fbb8207b18cb6fe79 /include | |
| parent | 8197cd440fe41c92ed6bb798e8e4e97797fd297d (diff) | |
Merged revision(s) 16986-16987 from trunk: refactor code when selected derivative on index page is changed by a plugin ...
fix ie7 display and unwanted text in print
git-svn-id: http://piwigo.org/svn/branches/2.4@16988 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
| -rw-r--r-- | include/category_default.inc.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/category_default.inc.php b/include/category_default.inc.php index 18ad85fb3..4c356a9ee 100644 --- a/include/category_default.inc.php +++ b/include/category_default.inc.php @@ -151,10 +151,8 @@ foreach ($pictures as $row) $tpl_thumbnails_var[] = $tpl_var; } -$derivative_params = trigger_event('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) ); - $template->assign( array( - 'derivative_params' =>$derivative_params, + 'derivative_params' => trigger_event('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) ), 'SHOW_THUMBNAIL_CAPTION' =>$conf['show_thumbnail_caption'], ) ); $tpl_thumbnails_var = trigger_event('loc_end_index_thumbnails', $tpl_thumbnails_var, $pictures); @@ -162,6 +160,6 @@ $template->assign('thumbnails', $tpl_thumbnails_var); $template->assign_var_from_handle('THUMBNAILS', 'index_thumbnails'); unset($pictures, $selection, $tpl_thumbnails_var); -$template->clear_assign( array('thumbnails', 'derivative_params') ); +$template->clear_assign( 'thumbnails' ); pwg_debug('end include/category_default.inc.php'); ?>
\ No newline at end of file |