site_iri: comparison web/wp-includes/plugin.php

equal deleted inserted replaced

-:2f6f6f7551ca
+:32102edaa81b
 * @subpackage Plugin
 * @since 2.5
 * @global array $wp_filter Stores all of the filters
 *
 * @param string $tag The name of the filter hook.
-* @param callback $function_to_check optional.  If specified, return the priority of that function on this hook or false if not attached.
+* @param callback $function_to_check optional. If specified, return the priority of that function on this hook or false if not attached.
 * @return int|boolean Optionally returns the priority on that hook for the specified function.
 */
 function has_filter($tag, $function_to_check = false) {
 	global $wp_filter;
 */
 function apply_filters($tag, $value) {
 	global $wp_filter, $merged_filters, $wp_current_filter;
 	$args = array();
-	$wp_current_filter[] = $tag;
 	// Do 'all' actions first
 	if ( isset($wp_filter['all']) ) {
+		$wp_current_filter[] = $tag;
 		$args = func_get_args();
 		_wp_call_all_hook($args);
 	}
 	if ( !isset($wp_filter[$tag]) ) {
-		array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) )
+			array_pop($wp_current_filter);
 		return $value;
 	}
+	if ( !isset($wp_filter['all']) )
+		$wp_current_filter[] = $tag;
 	// Sort
 	if ( !isset( $merged_filters[ $tag ] ) ) {
 		ksort($wp_filter[$tag]);
 		$merged_filters[ $tag ] = true;
 	return $value;
 }
 /**
+* Execute functions hooked on a specific filter hook, specifying arguments in an array.
+*
+* @see apply_filters() This function is identical, but the arguments passed to the
+* functions hooked to <tt>$tag</tt> are supplied using an array.
+*
+* @package WordPress
+* @subpackage Plugin
+* @since 3.0.0
+* @global array $wp_filter Stores all of the filters
+* @global array $merged_filters Merges the filter hooks using this function.
+* @global array $wp_current_filter stores the list of current filters with the current one last
+*
+* @param string $tag The name of the filter hook.
+* @param array $args The arguments supplied to the functions hooked to <tt>$tag</tt>
+* @return mixed The filtered value after all hooked functions are applied to it.
+*/
+function apply_filters_ref_array($tag, $args) {
+	global $wp_filter, $merged_filters, $wp_current_filter;
+	// Do 'all' actions first
+	if ( isset($wp_filter['all']) ) {
+		$wp_current_filter[] = $tag;
+		$all_args = func_get_args();
+		_wp_call_all_hook($all_args);
+	}
+	if ( !isset($wp_filter[$tag]) ) {
+		if ( isset($wp_filter['all']) )
+			array_pop($wp_current_filter);
+		return $args[0];
+	}
+	if ( !isset($wp_filter['all']) )
+		$wp_current_filter[] = $tag;
+	// Sort
+	if ( !isset( $merged_filters[ $tag ] ) ) {
+		ksort($wp_filter[$tag]);
+		$merged_filters[ $tag ] = true;
+	}
+	reset( $wp_filter[ $tag ] );
+	do {
+		foreach( (array) current($wp_filter[$tag]) as $the_ )
+			if ( !is_null($the_['function']) )
+				$args[0] = call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
+	} while ( next($wp_filter[$tag]) !== false );
+	array_pop( $wp_current_filter );
+	return $args[0];
+}
+/**
 * Removes a function from a specified filter hook.
 *
 * This function removes a function attached to a specified filter hook. This
 * method can be used to remove default functions attached to a specific filter
 * hook and possibly replace them with a substitute.
 * @since 1.2
 *
 * @param string $tag The filter hook to which the function to be removed is hooked.
 * @param callback $function_to_remove The name of the function which should be removed.
 * @param int $priority optional. The priority of the function (default: 10).
-* @param int $accepted_args optional. The number of arguments the function accpets (default: 1).
+* @param int $accepted_args optional. The number of arguments the function accepts (default: 1).
 * @return boolean Whether the function existed before it was removed.
 */
 function remove_filter($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
 	$function_to_remove = _wp_filter_build_unique_id($tag, $function_to_remove, $priority);
 */
 function remove_all_filters($tag, $priority = false) {
 	global $wp_filter, $merged_filters;
 	if( isset($wp_filter[$tag]) ) {
-		if( false !== $priority && isset($$wp_filter[$tag][$priority]) )
+		if( false !== $priority && isset($wp_filter[$tag][$priority]) )
 			unset($wp_filter[$tag][$priority]);
 		else
 			unset($wp_filter[$tag]);
 	}
 */
 function current_filter() {
 	global $wp_current_filter;
 	return end( $wp_current_filter );
 }
 /**
 * Hooks a function on to a specific action.
 *
 * Actions are the hooks that the WordPress core launches at specific points
 */
 function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
 	return add_filter($tag, $function_to_add, $priority, $accepted_args);
 }
 /**
 * Execute functions hooked on a specific action hook.
 *
 * This function invokes all functions attached to action hook $tag. It is
 * possible to create new action hooks by simply calling this function,
 * @return null Will return null if $tag does not exist in $wp_filter array
 */
 function do_action($tag, $arg = '') {
 	global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
-	if ( is_array($wp_actions) )
+	if ( ! isset($wp_actions) )
-		$wp_actions[] = $tag;
+		$wp_actions = array();
+	if ( ! isset($wp_actions[$tag]) )
+		$wp_actions[$tag] = 1;
 	else
-		$wp_actions = array($tag);
+		++$wp_actions[$tag];
-	$wp_current_filter[] = $tag;
 	// Do 'all' actions first
 	if ( isset($wp_filter['all']) ) {
+		$wp_current_filter[] = $tag;
 		$all_args = func_get_args();
 		_wp_call_all_hook($all_args);
 	}
 	if ( !isset($wp_filter[$tag]) ) {
-		array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) )
+			array_pop($wp_current_filter);
 		return;
 	}
+	if ( !isset($wp_filter['all']) )
+		$wp_current_filter[] = $tag;
 	$args = array();
-	if ( is_array($arg) && 1 == count($arg) && is_object($arg[0]) ) // array(&$this)
+	if ( is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0]) ) // array(&$this)
 		$args[] =& $arg[0];
 	else
 		$args[] = $arg;
 	for ( $a = 2; $a < func_num_args(); $a++ )
 		$args[] = func_get_arg($a);
 	array_pop($wp_current_filter);
 }
 /**
-* Retrieve the number times an action is fired.
+* Retrieve the number of times an action is fired.
 *
 * @package WordPress
 * @subpackage Plugin
 * @since 2.1
 * @global array $wp_actions Increments the amount of times action was triggered.
 * @return int The number of times action hook <tt>$tag</tt> is fired
 */
 function did_action($tag) {
 	global $wp_actions;
-	if ( empty($wp_actions) )
+	if ( ! isset( $wp_actions ) || ! isset( $wp_actions[$tag] ) )
 		return 0;
-	return count(array_keys($wp_actions, $tag));
+	return $wp_actions[$tag];
 }
 /**
 * Execute functions hooked on a specific action hook, specifying arguments in an array.
 *
 * @return null Will return null if $tag does not exist in $wp_filter array
 */
 function do_action_ref_array($tag, $args) {
 	global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
-	if ( !is_array($wp_actions) )
+	if ( ! isset($wp_actions) )
-		$wp_actions = array($tag);
+		$wp_actions = array();
+	if ( ! isset($wp_actions[$tag]) )
+		$wp_actions[$tag] = 1;
 	else
-		$wp_actions[] = $tag;
+		++$wp_actions[$tag];
-	$wp_current_filter[] = $tag;
 	// Do 'all' actions first
 	if ( isset($wp_filter['all']) ) {
+		$wp_current_filter[] = $tag;
 		$all_args = func_get_args();
 		_wp_call_all_hook($all_args);
 	}
 	if ( !isset($wp_filter[$tag]) ) {
-		array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) )
+			array_pop($wp_current_filter);
 		return;
 	}
+	if ( !isset($wp_filter['all']) )
+		$wp_current_filter[] = $tag;
 	// Sort
 	if ( !isset( $merged_filters[ $tag ] ) ) {
 		ksort($wp_filter[$tag]);
 		$merged_filters[ $tag ] = true;
 * @subpackage Plugin
 * @since 2.5
 * @see has_filter() has_action() is an alias of has_filter().
 *
 * @param string $tag The name of the action hook.
-* @param callback $function_to_check optional.  If specified, return the priority of that function on this hook or false if not attached.
+* @param callback $function_to_check optional. If specified, return the priority of that function on this hook or false if not attached.
 * @return int|boolean Optionally returns the priority on that hook for the specified function.
 */
 function has_action($tag, $function_to_check = false) {
 	return has_filter($tag, $function_to_check);
 }
 * @since 1.2
 *
 * @param string $tag The action hook to which the function to be removed is hooked.
 * @param callback $function_to_remove The name of the function which should be removed.
 * @param int $priority optional The priority of the function (default: 10).
-* @param int $accepted_args optional. The number of arguments the function accpets (default: 1).
+* @param int $accepted_args optional. The number of arguments the function accepts (default: 1).
 * @return boolean Whether the function is removed.
 */
 function remove_action($tag, $function_to_remove, $priority = 10, $accepted_args = 1) {
 	return remove_filter($tag, $function_to_remove, $priority, $accepted_args);
 }
 * executing.
 *
 * @since 2.7
 *
 * @param string $file
-* @param callback $callback The callback to run when the hook is called.
+* @param callback $callback The callback to run when the hook is called. Must be a static method or function.
 */
-function register_uninstall_hook($file, $callback) {
+function register_uninstall_hook( $file, $callback ) {
+	if ( is_array( $callback ) && is_object( $callback[0] ) ) {
+		_doing_it_wrong( __FUNCTION__, __( 'Only a static class method or function can be used in an uninstall hook.' ), '3.1' );
+		return;
+	}
 	// The option should not be autoloaded, because it is not needed in most
 	// cases. Emphasis should be put on using the 'uninstall.php' way of
 	// uninstalling the plugin.
 	$uninstallable_plugins = (array) get_option('uninstall_plugins');
 	$uninstallable_plugins[plugin_basename($file)] = $callback;
 * @link http://trac.wordpress.org/ticket/3875
 *
 * @global array $wp_filter Storage for all of the filters and actions
 * @param string $tag Used in counting how many hooks were applied
 * @param callback $function Used for creating unique id
-* @param int|bool $priority Used in counting how many hooks were applied.  If === false and $function is an object reference, we return the unique id only if it already has one, false otherwise.
+* @param int|bool $priority Used in counting how many hooks were applied. If === false and $function is an object reference, we return the unique id only if it already has one, false otherwise.
-* @param string $type filter or action
+* @return string|bool Unique ID for usage as array key or false if $priority === false and $function is an object reference, and it does not already have a unique id.
-* @return string|bool Unique ID for usage as array key or false if $priority === false and $function is an object reference, and it does not already have a uniqe id.
 */
 function _wp_filter_build_unique_id($tag, $function, $priority) {
 	global $wp_filter;
 	static $filter_id_count = 0;
-	if ( is_string($function) ) {
+	if ( is_string($function) )
 		return $function;
-	} else if (is_object($function[0]) ) {
+	if ( is_object($function) ) {
+		// Closures are currently implemented as objects
+		$function = array( $function, '' );
+	} else {
+		$function = (array) $function;
+	}
+	if (is_object($function[0]) ) {
 		// Object Class Calling
 		if ( function_exists('spl_object_hash') ) {
 			return spl_object_hash($function[0]) . $function[1];
 		} else {
 			$obj_idx = get_class($function[0]).$function[1];
 				$function[0]->wp_filter_id = $filter_id_count;
 				++$filter_id_count;
 			} else {
 				$obj_idx .= $function[0]->wp_filter_id;
 			}
 			return $obj_idx;
 		}
 	} else if ( is_string($function[0]) ) {
 		// Static Calling
 		return $function[0].$function[1];
 	}
 }
-?>

changeset 194	32102edaa81b
parent 136	bde1974c263b
child 204	09a1c134465b