Changeset 5169 for trunk/wp-includes/plugin.php

Timestamp:

04/02/2007 07:03:38 AM (18 years ago)

Author:

matt

Message:

Fixes bottlenecks found in filter system using xdebug + kcachegrind. merge_filters was being called 1000+ times.

File:

• trunk/wp-includes/plugin.php (modified) (5 diffs)

trunk/wp-includes/plugin.php

@@ -17 +17 @@
  */
 function add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
-    global $wp_filter;
+    global $wp_filter, $merged_filters;
 
     // So the format is wp_filter['tag']['array of priorities']['array of functions serialized']['array of ['array (functions, accepted_args)]']
     $wp_filter[$tag][$priority][serialize($function_to_add)] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
+    unset( $merged_filters[ $tag ] );
     return true;
 }
@@ -38 +39 @@
  */
 function apply_filters($tag, $string) {
-    global $wp_filter;
-
-    merge_filters($tag);
+    global $wp_filter, $merged_filters;
+
+    if ( !isset( $merged_filters[ $tag ] ) )
+        merge_filters($tag);
 
     if ( !isset($wp_filter[$tag]) )
@@ -69 +71 @@
  */
 function merge_filters($tag) {
-    global $wp_filter;
-
-    if ( isset($wp_filter['all']) )
+    global $wp_filter, $merged_filters;
+
+    if ( is_array($wp_filter['all']) )
         $wp_filter[$tag] = array_merge($wp_filter['all'], (array) $wp_filter[$tag]);
 
@@ -78 +80 @@
         uksort($wp_filter[$tag], "strnatcasecmp");
     }
+    $merged_filters[ $tag ] = true;
 }
 
@@ -93 +96 @@
  */
 function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
-    global $wp_filter;
+    global $wp_filter, $merged_filters;
 
     unset($GLOBALS['wp_filter'][$tag][$priority][serialize($function_to_remove)]);
+    unset( $merged_filters[ $tag ] );
 
     return true;