Changeset 30029

Timestamp:

Oct 13, 2014, 1:16:50 PM (10 years ago)

Author:

JanisV

Message:

Compatibility with VideoJS

File:

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

extensions/Fotorama/main.inc.php

@@ -27 +27 @@
   if ($conf['light_slideshow'])
   {
-    add_event_handler('render_element_content', 'Fotorama_element_content');
+    add_event_handler('render_element_content', 'Fotorama_element_content', EVENT_HANDLER_PRIORITY_NEUTRAL-10);
     add_event_handler('loc_end_picture', 'Fotorama_end_picture');
     add_event_handler('loc_end_page_header', 'Fotorama_end_page_header');
@@ -76 +76 @@
 }
 
-function Fotorama_element_content()
+function Fotorama_element_content($content, $picture)
 {
   global $page;
@@ -84 +84 @@
     $page['slideshow'] = true;
   }
+
+  return $content;
 }
 
@@ -124 +126 @@
 
     $current = $template->get_template_vars('current');
-    $type = $current['selected_derivative']->get_type();
+    if (isset($current['selected_derivative']))
+    {
+      $type = $current['selected_derivative']->get_type();
+    }
+
     $defined = ImageStdParams::get_defined_type_map();
-    if (!isset($defined[$type]))
+    if (!isset($type) or !isset($defined[$type]))
     {
       $type = pwg_get_session_var('picture_deriv', $conf['derivative_default_size']);