Changeset 29943

Timestamp:

Oct 9, 2014, 11:18:58 AM (10 years ago)

Author:

JanisV

Message:

Improve checking global enabling slideshow

File:

• extensions/Fotorama/main.inc.php (modified) (4 diffs)

extensions/Fotorama/main.inc.php

@@ -25 +25 @@
 else
 {
-  add_event_handler('loc_end_picture', 'Fotorama_end_picture');
-  add_event_handler('loc_end_page_header', 'Fotorama_end_page_header');
+  if ($conf['light_slideshow'])
+  {
+    add_event_handler('loc_end_picture', 'Fotorama_end_picture');
+    add_event_handler('loc_end_page_header', 'Fotorama_end_page_header');
+  }
 }
 
@@ -88 +91 @@
   }
   
-  if ($page['slideshow'] and $conf['light_slideshow'])
+  if ($page['slideshow'])
   {
     $query = '
@@ -100 +103 @@
 
     $current = $template->get_template_vars('current');
+    print_r($current);
     $type = $current['selected_derivative']->get_type();
     $defined = ImageStdParams::get_defined_type_map();
@@ -198 +202 @@
   }
 
-  if (isset($page['slideshow']) and $page['slideshow'] and $conf['light_slideshow'])
+  if (isset($page['slideshow']) and $page['slideshow'])
   {
     $template->clear_assign('page_refresh');