fix checkbox of selected derivative on index page when a plugin overrides the default value (merge from 2.4 to trunk)

git-svn-id: http://piwigo.org/svn/trunk@16986 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 3 insertions, 4 deletions

diff --git a/index.php b/index.php
index c6ee29d96..e6f6b5965 100644
--- a/index.php
+++ b/index.php
@@ -279,7 +279,7 @@ if ( count($page['items']) > 0 )
           duplicate_index_url(),
           array('display' => '')
         );
-  $selected_type = pwg_get_session_var('index_deriv', IMG_THUMB);
+  $selected_type = trigger_event('get_index_derivative_params', ImageStdParams::get_by_type( pwg_get_session_var('index_deriv', IMG_THUMB) ) )->type;
   $type_map = ImageStdParams::get_defined_type_map();
   unset($type_map[IMG_XXLARGE], $type_map[IMG_XLARGE]);
   foreach($type_map as $params)
diff --git a/themes/default/fix-ie7.css b/themes/default/fix-ie7.css
index 73868ff62..479f39f7a 100644
--- a/themes/default/fix-ie7.css
+++ b/themes/default/fix-ie7.css
@@ -15,8 +15,7 @@
 
 .thumbnails .wrap2 IMG {
   position: relative;
-  top: -50%;   
-  margin-top: 2%;
+  top: -50%;
 }
 
 .pwg-icon {
diff --git a/themes/default/print.css b/themes/default/print.css
index 3f68df3c9..89823a3df 100644
--- a/themes/default/print.css
+++ b/themes/default/print.css
@@ -1,6 +1,6 @@
 @media print {
 #menubar, .content .navigationBar, .categoryActions, .content .calendarViews, .calendarBar,
-#imageToolBar, .navThumb, #addComment {
+#imageToolBar, .navThumb, #commentAdd {
 	display: none;
 }