Ticket #19417: 19417.refresh.diff

wp-includes/plugin.php

@@ -251 +251 @@
  * @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 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 remove_filter($tag, $function_to_remove, $priority = 10 ) {
         $function_to_remove = _wp_filter_build_unique_id($tag, $function_to_remove, $priority);
 
         $r = isset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]);
@@ -500 +499 @@
  * @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);
+function has_action( $tag, $function_to_check = false ) {
+        return has_filter( $tag, $function_to_check );
 }
 
 /**
@@ -518 +517 @@
  * @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 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);
+function remove_action( $tag, $function_to_remove, $priority = 10 ) {
+        return remove_filter( $tag, $function_to_remove, $priority );
 }
 
 /**

wp-includes/taxonomy.php

@@ -1218 +1218 @@
         }
 
         // $args can be whatever, only use the args defined in defaults to compute the key
-        $filter_key = ( has_filter('list_terms_exclusions') ) ? serialize($GLOBALS['wp_filter']['list_terms_exclusions']) : '';
+        $filter_key = false !== has_filter( 'list_terms_exclusions' ) ? serialize($GLOBALS['wp_filter']['list_terms_exclusions']) : '';
         $key = md5( serialize( compact(array_keys($defaults)) ) . serialize( $taxonomies ) . $filter_key );
         $last_changed = wp_cache_get('last_changed', 'terms');
         if ( !$last_changed ) {

wp-includes/functions.php

@@ -984 +984 @@
                 $feed = get_default_feed();
 
         $hook = 'do_feed_' . $feed;
-        if ( !has_action($hook) ) {
+        if ( false === has_action( $hook ) ) {
                 $message = sprintf( __( 'ERROR: %s is not a valid feed template.' ), esc_html($feed));
                 wp_die( $message, '', array( 'response' => 404 ) );
         }

wp-includes/class-wp.php

@@ -405 +405 @@
                 }
 
                 // query_string filter deprecated. Use request filter instead.
-                if ( has_filter('query_string') ) {  // Don't bother filtering and parsing if no plugins are hooked in.
+                if ( false !== has_filter( 'query_string' ) ) {  // Don't bother filtering and parsing if no plugins are hooked in.
                         $this->query_string = apply_filters('query_string', $this->query_string);
                         parse_str($this->query_string, $this->query_vars);
                 }

wp-includes/capabilities.php

@@ -1105 +1105 @@
 
                 $meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false;
 
-                if ( $meta_key && has_filter( "auth_post_meta_{$meta_key}" ) ) {
+                if ( $meta_key && false !== has_filter( "auth_post_meta_{$meta_key}" ) ) {
                         $allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
                         if ( ! $allowed )
                                 $caps[] = $cap;

wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -150 +150 @@
                         'users'       => __( 'Users' )
                 );
 
-                if ( has_filter( 'wpmublogsaction' ) )
+                if ( false !== has_filter( 'wpmublogsaction' ) )
                         $sites_columns['plugins'] = __( 'Actions' );
 
                 $sites_columns = apply_filters( 'wpmu_blogs_columns', $sites_columns );
@@ -317 +317 @@
                                         break;
 
                                 case 'plugins': ?>
-                                        <?php if ( has_filter( 'wpmublogsaction' ) ) {
+                                        <?php if ( false !== has_filter( 'wpmublogsaction' ) ) {
                                         echo "<td valign='top' class='$column_name column-$column_name'$style>";
                                                 do_action( 'wpmublogsaction', $blog['blog_id'] ); ?>
                                         </td>

wp-admin/includes/plugin.php

@@ -1507 +1507 @@
 
 function get_plugin_page_hook( $plugin_page, $parent_page ) {
         $hook = get_plugin_page_hookname( $plugin_page, $parent_page );
-        if ( has_action($hook) )
+        if ( false !== has_action($hook) )
                 return $hook;
         else
                 return null;

wp-admin/user-edit.php

@@ -207 +207 @@
                 <td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php checked('false', $profileuser->rich_editing); ?> /> <?php _e('Disable the visual editor when writing'); ?></label></td>
         </tr>
 <?php endif; ?>
-<?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) : ?>
+<?php if ( ( count( $_wp_admin_css_colors ) > 1 ) && ( false !== has_action( 'admin_color_scheme_picker' ) ) ) : ?>
 <tr>
 <th scope="row"><?php _e('Admin Color Scheme')?></th>
 <td><?php do_action( 'admin_color_scheme_picker' ); ?></td>