Changeset 16988 for branches/2.4/include

Timestamp:

Jul 24, 2012, 10:48:44 PM (12 years ago)

Author:

rvelices

Message:

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

File:

• branches/2.4/include/category_default.inc.php (modified) (2 diffs)

branches/2.4/include/category_default.inc.php

@@ -152 +152 @@
 }
 
-$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'],
     ) );
@@ -163 +161 @@
 $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');
 ?>