Ticket #8640: 8640.2.diff

wp-includes/default-filters.php

@@ -16 +16 @@
 $filters = array('pre_term_name', 'pre_comment_author_name', 'pre_link_name', 'pre_link_target',
         'pre_link_rel', 'pre_user_display_name', 'pre_user_first_name', 'pre_user_last_name',
         'pre_user_nickname');
-foreach ( $filters as $filter ) {
-        add_filter($filter, 'strip_tags');
-        add_filter($filter, 'trim');
-        add_filter($filter, 'wp_filter_kses');
-        add_filter($filter, 'wp_specialchars', 30);
-}
 
+add_filters($filter, 'strip_tags');
+add_filters($filter, 'trim');
+add_filters($filter, 'wp_filter_kses');
+add_filters($filter, 'wp_specialchars', 30);
+
 // Kses only for textarea saves
 $filters = array('pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description');
-foreach ( $filters as $filter ) {
-        add_filter($filter, 'wp_filter_kses');
-}
+add_filters($filter, 'wp_filter_kses');
 
 // Email
 $filters = array('pre_comment_author_email', 'pre_user_email');
-foreach ( $filters as $filter ) {
-        add_filter($filter, 'trim');
-        add_filter($filter, 'sanitize_email');
-        add_filter($filter, 'wp_filter_kses');
-}
+add_filters($filter, 'trim');
+add_filters($filter, 'sanitize_email');
+add_filters($filter, 'wp_filter_kses');
 
+
 // Save URL
 $filters = array('pre_comment_author_url', 'pre_user_url', 'pre_link_url', 'pre_link_image',
         'pre_link_rss');
-foreach ( $filters as $filter ) {
-        add_filter($filter, 'strip_tags');
-        add_filter($filter, 'trim');
-        add_filter($filter, 'sanitize_url');
-        add_filter($filter, 'wp_filter_kses');
-}
+add_filters($filter, 'strip_tags');
+add_filters($filter, 'trim');
+add_filters($filter, 'sanitize_url');
+add_filters($filter, 'wp_filter_kses');
 
 // Display URL
 $filters = array('user_url', 'link_url', 'link_image', 'link_rss', 'comment_url');
-foreach ( $filters as $filter ) {
-        add_filter($filter, 'strip_tags');
-        add_filter($filter, 'trim');
-        add_filter($filter, 'clean_url');
-        add_filter($filter, 'wp_filter_kses');
-}
+add_filters($filter, 'strip_tags');
+add_filters($filter, 'trim');
+add_filters($filter, 'clean_url');
+add_filters($filter, 'wp_filter_kses');
 
 // Slugs
 $filters = array('pre_term_slug');
-foreach ( $filters as $filter ) {
-        add_filter($filter, 'sanitize_title');
-}
+add_filters($filter, 'sanitize_title');
 
 // Keys
 $filters = array('pre_post_type');
-foreach ( $filters as $filter ) {
-        add_filter($filter, 'sanitize_user');
-}
+add_filters($filter, 'sanitize_user');
 
 // Places to balance tags on input
 $filters = array('content_save_pre', 'excerpt_save_pre', 'comment_save_pre', 'pre_comment_content');
-foreach ( $filters as $filter ) {
-        add_filter( $filter, 'balanceTags', 50);
-}
+add_filters( $filter, 'balanceTags', 50);
 
 // Format strings for display.
 $filters = array('comment_author', 'term_name', 'link_name', 'link_description',
         'link_notes', 'bloginfo', 'wp_title');
-foreach ( $filters as $filter ) {
-        add_filter($filter, 'wptexturize');
-        add_filter($filter, 'convert_chars');
-        add_filter($filter, 'wp_specialchars');
-}
+add_filters($filter, 'wptexturize');
+add_filters($filter, 'convert_chars');
+add_filters($filter, 'wp_specialchars');
 
 // Format text area for display.
 $filters = array('term_description');
-foreach ( $filters as $filter ) {
-        add_filter($filter, 'wptexturize');
-        add_filter($filter, 'convert_chars');
-        add_filter($filter, 'wpautop');
-}
+add_filters($filter, 'wptexturize');
+add_filters($filter, 'convert_chars');
+add_filters($filter, 'wpautop');
 
 // Format for RSS
 $filters = array('term_name_rss');
-foreach ( $filters as $filter ) {
-        add_filter($filter, 'convert_chars');
-}
+add_filters($filter, 'convert_chars');
 
 // Display filters
-add_filter('the_title', 'wptexturize');
-add_filter('the_title', 'convert_chars');
-add_filter('the_title', 'trim');
+$funcitons = array('wptexturize', 'convert_chars', 'trim');
+add_filters_func('the_title', $funcitons);
 
-add_filter('the_content', 'wptexturize');
-add_filter('the_content', 'convert_smilies');
-add_filter('the_content', 'convert_chars');
-add_filter('the_content', 'wpautop');
-add_filter('the_content', 'prepend_attachment');
+$functions = array('wptexturize', 'convert_smilies', 'convert_chars', 'wpautop', 'prepend_attachment');
+add_filters_func('the_content', $functions);
 
-add_filter('the_excerpt', 'wptexturize');
-add_filter('the_excerpt', 'convert_smilies');
-add_filter('the_excerpt', 'convert_chars');
-add_filter('the_excerpt', 'wpautop');
+$functions = array('wptexturize', 'convert_smilies', 'convert_chars', 'wpautop');
+add_filters_func('the_excerpt', $functions);
 add_filter('get_the_excerpt', 'wp_trim_excerpt');
 
-add_filter('comment_text', 'wptexturize');
-add_filter('comment_text', 'convert_chars');
+$functions = array('wptexturize', 'convert_chars');
+add_filters_func('comment_text', $functions);
 add_filter('comment_text', 'make_clickable', 9);
 add_filter('comment_text', 'force_balance_tags', 25);
 add_filter('comment_text', 'convert_smilies', 20);
@@ -123 +97 @@
 
 add_filter('comment_excerpt', 'convert_chars');
 
-add_filter('list_cats', 'wptexturize');
-add_filter('single_post_title', 'wptexturize');
+$filters = array('list_cats', 'single_post_title');
+add_filters($filters, 'wptexturize');
 
 add_filter('wp_sprintf', 'wp_sprintf_l', 10, 2);
 

wp-includes/plugin.php

@@ -72 +72 @@
 }
 
 /**
+ * Hooks multiple functions to a specific filter action.
+ *
+ * <code>
+ * function example_hook($example) { echo $example; }
+ * add_filters(array('example_filter1', 'example_filter2'), 'example_hook');
+ * </code>
+ *
+ * @package WordPress
+ * @subpackage Plugin
+ * @since 2.8.0
+ * @global array $wp_filter Stores all of the filters added in the form of
+ *      wp_filter['tag']['array of priorities']['array of functions serialized']['array of ['array (functions, accepted_args)]']
+ * @global array $merged_filters Tracks the tags that need to be merged for later. If the hook is added, it doesn't need to run through that process.
+ *
+ * @param array of string $tags The names of the filters to hook the $function_to_add to.
+ * @param callback $function_to_add The name of the function to be called when the filter is applied.
+ * @param int $priority optional. Used to specify the order in which the functions associated with a particular action are executed (default: 10). Lower numbers correspond with earlier execution, and functions with the same priority are executed in the order in which they were added to the action.
+ * @param int $accepted_args optional. The number of arguments the function accept (default 1).
+ * @return boolean true
+ */
+
+function add_filters($tags, $function_to_add, $priority = 10, $accepted_args = 1) {
+        foreach ( (array) $tags as $tag ) {
+                add_filter($tag, $function_to_add, $priority, $accepted_args);
+        }
+        return true;
+}
+
+/**
+ * Hooks multiple filters to a single function.
+ *
+ * <code>
+ * function example_hook1($example) { echo $example; }
+ * function example_hook2($example) { echo $example; }
+ * add_filters_func('example_filter', array('example_hook1', 'example_hook2'));
+ * </code>
+ *
+ * @package WordPress
+ * @subpackage Plugin
+ * @since 2.8.0
+ * @global array $wp_filter Stores all of the filters added in the form of
+ *      wp_filter['tag']['array of priorities']['array of functions serialized']['array of ['array (functions, accepted_args)]']
+ * @global array $merged_filters Tracks the tags that need to be merged for later. If the hook is added, it doesn't need to run through that process.
+ *
+ * @param string $tag The names of the filters to hook the $functions to.
+ * @param array of functions $functions The name of the functions to be called when the filter is applied.
+ * @param int $priority optional. Used to specify the order in which the functions associated with a particular action are executed (default: 10). Lower numbers correspond with earlier execution, and functions with the same priority are executed in the order in which they were added to the action.
+ * @param int $accepted_args optional. The number of arguments the function accept (default 1).
+ * @return boolean true
+ */
+
+function add_filters_func($tag, $functions, $priority = 10, $accepted_args = 1) {
+        foreach ( (array) $functions as $function ) {
+                add_filter($tag, $function, $priority, $accepted_args);
+        }
+        return true;
+}
+
+
+/**
  * Check if any filter has been registered for a hook.
  *
  * @package WordPress
@@ -273 +333 @@
 }
 
 
+
 /**
+ * Hooks a function on to multiple actions.
+ *
+ * @uses add_filters() Adds an action. Parameter list and functionality are the same.
+ *
+ * @package WordPress
+ * @subpackage Plugin
+ * @since 1.8
+ *
+ * @param array of string $tag The names of the actions to which the $function_to_add is hooked.
+ * @param callback $function_to_add The name of the function you wish to be called.
+ * @param int $priority optional. Used to specify the order in which the functions associated with a particular action are executed (default: 10). Lower numbers correspond with earlier execution, and functions with the same priority are executed in the order in which they were added to the action.
+ * @param int $accepted_args optional. The number of arguments the function accept (default 1).
+ */
+function add_actions($tags, $function_to_add, $priority = 10, $accepted_args = 1) {
+        return add_filters($tags, $function_to_add, $priority, $accepted_args);
+}
+
+/**
+ * Hooks a function on to multiple actions.
+ *
+ * @uses add_filters_func() Adds an action. Parameter list and functionality are the same.
+ *
+ * @package WordPress
+ * @subpackage Plugin
+ * @since 2.8.0
+ *
+ * @param string $tag The names of the actions to which the $functions is hooked.
+ * @param array of $functions The name of the functions you wish to be called.
+ * @param int $priority optional. Used to specify the order in which the functions associated with a particular action are executed (default: 10). Lower numbers correspond with earlier execution, and functions with the same priority are executed in the order in which they were added to the action.
+ * @param int $accepted_args optional. The number of arguments the function accept (default 1).
+ */
+function add_actions_func($tag, $functions, $priority = 10, $accepted_args = 1) {
+        return add_filters_func($tag, $functions, $priority, $accepted_args);
+}
+
+
+/**
  * Execute functions hooked on a specific action hook.
  *
  * This function invokes all functions attached to action hook $tag. It is