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

Timestamp:

10/13/2006 02:01:53 PM (20 years ago)

Author:

markjaquith

Message:

Code cleanup: wp-includes/plugin.php

File:

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

trunk/wp-includes/plugin.php

@@ -13 +13 @@
                         // uncomment if we want to match function AND accepted_args
                         // if ( $filter == array($function, $accepted_args) ) {
-                        if ( $filter['function'] == $function_to_add ) {
+                        if ( $filter['function'] == $function_to_add )
                                 return true;
-                        }
                 }
         }
@@ -33 +32 @@
         merge_filters($tag);
 
-        if ( !isset($wp_filter[$tag]) ) {
+        if ( !isset($wp_filter[$tag]) )
                 return $string;
-        }
-        foreach ($wp_filter[$tag] as $priority => $functions) {
+
+        foreach ( (array) $wp_filter[$tag] as $priority => $functions ) {
                 if ( !is_null($functions) ) {
-                        foreach($functions as $function) {
-
+                        foreach ( (array) $functions as $function ) {
                                 $function_name = $function['function'];
                                 $accepted_args = $function['accepted_args'];
-
                                 $the_args = $args;
                                 array_unshift($the_args, $string);
                                 if ( $accepted_args > 0 )
                                         $the_args = array_slice($the_args, 0, $accepted_args);
-                                elseif ( $accepted_args == 0 )
+                                elseif ( 0 == $accepted_args )
                                         $the_args = NULL;
-
                                 $string = call_user_func_array($function_name, $the_args);
                         }
@@ -57 +53 @@
 }
 
-
 function merge_filters($tag) {
         global $wp_filter;
         if ( isset($wp_filter['all']) ) {
-                foreach ($wp_filter['all'] as $priority => $functions) {
+                foreach ( (array) $wp_filter['all'] as $priority => $functions ) {
                         if ( isset($wp_filter[$tag][$priority]) )
                                 $wp_filter[$tag][$priority] = array_merge($wp_filter['all'][$priority], $wp_filter[$tag][$priority]);
@@ -74 +69 @@
 }
 
-
-
 function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
         global $wp_filter;
@@ -82 +75 @@
         if ( isset($wp_filter[$tag]["$priority"]) ) {
                 $new_function_list = array();
-                foreach($wp_filter[$tag]["$priority"] as $filter) {
-                        if ( $filter['function'] != $function_to_remove ) {
+                foreach ( (array) $wp_filter[$tag]["$priority"] as $filter ) {
+                        if ( $filter['function'] != $function_to_remove )
                                 $new_function_list[] = $filter;
-                        }
                 }
                 $wp_filter[$tag]["$priority"] = $new_function_list;
@@ -115 +107 @@
                 return;
 
-        foreach ($wp_filter[$tag] as $priority => $functions) {
+        foreach ( (array) $wp_filter[$tag] as $priority => $functions ) {
                 if ( !is_null($functions) ) {
-                        foreach($functions as $function) {
-
+                        foreach ( (array) $functions as $function ) {
                                 $function_name = $function['function'];
                                 $accepted_args = $function['accepted_args'];
@@ -143 +134 @@
                 return;
 
-        foreach ($wp_filter[$tag] as $priority => $functions) {
+        foreach ( (array) $wp_filter[$tag] as $priority => $functions ) {
                 if ( !is_null($functions) ) {
-                        foreach($functions as $function) {
-
+                        foreach( (array) $functions as $function ) {
                                 $function_name = $function['function'];
                                 $accepted_args = $function['accepted_args'];
-
                                 if ( $accepted_args > 0 )
                                         $the_args = array_slice($args, 0, $accepted_args);
-                                elseif ( $accepted_args == 0 )
+                                elseif ( 0 == $accepted_args )
                                         $the_args = NULL;
                                 else
@@ -179 +168 @@
 function register_activation_hook($file, $function) {
         $file = plugin_basename($file);
-
         add_action('activate_' . $file, $function);
 }
@@ -185 +173 @@
 function register_deactivation_hook($file, $function) {
         $file = plugin_basename($file);
-
         add_action('deactivate_' . $file, $function);
 }