Changeset 8263

Timestamp:

Dec 23, 2010, 9:46:16 PM (13 years ago)

Author:

rvelices

Message:

• faster trigger_event/trigger_action (it was overly complicated)
• added a new param to get_thumbnail_url event
• get_thumbnail_location is called only if the thumbnail does not exist

Location:

trunk/include

Files:

• functions.inc.php (modified) (2 diffs)
• functions_plugins.inc.php (modified) (4 diffs)

trunk/include/functions.inc.php

@@ -736 +736 @@
 function get_thumbnail_url($element_info)
 {
-  $path = get_thumbnail_location($element_info);
-  if ( !url_is_remote($path) )
-  {
-    $path = embellish_url(get_root_url().$path);
-  }
-
+  $loc = $url = get_thumbnail_location($element_info);
+  if ( !url_is_remote($loc) )
+  {
+    $url = (get_root_url().$loc);
+  }
   // plugins want another url ?
-  $path = trigger_event('get_thumbnail_url', $path, $element_info);
-  return $path;
+  $url = trigger_event('get_thumbnail_url', $url, $element_info, $loc);
+  return embellish_url($url);
 }
 
@@ -767 +766 @@
     $path = get_themeconf('mime_icon_dir')
         .strtolower(get_extension($element_info['path'])).'.png';
-  }
-
-  // plugins want another location ?
-  $path = trigger_event( 'get_thumbnail_location', $path, $element_info);
+    // plugins want another location ?
+    $path = trigger_event( 'get_thumbnail_location', $path, $element_info);
+  }
   return $path;
 }

trunk/include/functions_plugins.inc.php

@@ -120 +120 @@
     return $data;
   }
-  $args = array_slice(func_get_args(), 2);
+  $args = func_get_args();
 
   foreach ($pwg_event_handlers[$event] as $priority => $handlers)
@@ -126 +126 @@
     foreach($handlers as $handler)
     {
-      $all_args = array_merge( array($data), $args);
       $function_name = $handler['function'];
       $accepted_args = $handler['accepted_args'];
-
-      if ( $accepted_args == 1 )
-        $the_args = array($data);
-      elseif ( $accepted_args > 1 )
-        $the_args = array_slice($all_args, 0, $accepted_args);
-      elseif ( $accepted_args == 0 )
-        $the_args = NULL;
-      else
-        $the_args = $all_args;
-
-      $data = call_user_func_array($function_name, $the_args);
+      $args[1] = $data;
+      $data = call_user_func_array($function_name, array_slice($args,1,$accepted_args) );
     }
   }
@@ -160 +150 @@
     return;
   }
-  $args = array_slice(func_get_args(), 2);
+  $args = func_get_args();
 
   foreach ($pwg_event_handlers[$event] as $priority => $handlers)
@@ -166 +156 @@
     foreach($handlers as $handler)
     {
-      $all_args = array_merge( array($data), $args);
       $function_name = $handler['function'];
       $accepted_args = $handler['accepted_args'];
 
-      if ( $accepted_args == 1 )
-        $the_args = array($data);
-      elseif ( $accepted_args > 1 )
-        $the_args = array_slice($all_args, 0, $accepted_args);
-      elseif ( $accepted_args == 0 )
-        $the_args = NULL;
-      else
-        $the_args = $all_args;
-
-      call_user_func_array($function_name, $the_args);
+      call_user_func_array($function_name, array_slice($args,1,$accepted_args) );
     }
   }