From 2984cdf457ed5c5a7aa6b00b4d3949d196bf92e7 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Mon, 14 Dec 2015 02:35:26 +0000 Subject: [PATCH] Revert [35910]. Built from https://develop.svn.wordpress.org/trunk@35911 git-svn-id: http://core.svn.wordpress.org/trunk@35875 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/plugin.php | 12 ++++++------ wp-includes/version.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php index b836c4853c..1ec2497ef3 100644 --- a/wp-includes/plugin.php +++ b/wp-includes/plugin.php @@ -191,9 +191,9 @@ function has_filter($tag, $function_to_check = false) { * @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 mixed $value The value on which the filters hooked to `$tag` are applied on. - * @param mixed $var,... Additional variables passed to the functions hooked to `$tag`. + * @param string $tag The name of the filter hook. + * @param mixed $value The value on which the filters hooked to `$tag` are applied on. + * @param mixed $var Additional variables passed to the functions hooked to `$tag`. * @return mixed The filtered value after all hooked functions are applied to it. */ function apply_filters( $tag, $value ) { @@ -475,9 +475,9 @@ function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) * @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 action to be executed. - * @param mixed $arg,... Optional. Additional arguments which are passed on to the - * functions hooked to the action. Default empty. + * @param string $tag The name of the action to be executed. + * @param mixed $arg Optional. Additional arguments which are passed on to the + * functions hooked to the action. Default empty. */ function do_action($tag, $arg = '') { global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter; diff --git a/wp-includes/version.php b/wp-includes/version.php index 3b456a2271..43736ffb8d 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-alpha-35910'; +$wp_version = '4.5-alpha-35911'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.