Changeset 36302

Timestamp:

01/14/2016 08:05:06 PM (9 years ago)

Author:

swissspidy

Message:

Allow searching for 0 throughout the admin.

Fixes #31025.

Location:

trunk/src/wp-admin

Files:

• edit-comments.php (modified) (1 diff)
• edit-tags.php (modified) (1 diff)
• edit.php (modified) (1 diff)
• includes/class-wp-plugins-list-table.php (modified) (3 diffs)
• link-manager.php (modified) (1 diff)
• network/sites.php (modified) (1 diff)
• network/themes.php (modified) (1 diff)
• network/users.php (modified) (1 diff)
• plugins.php (modified) (1 diff)
• upload.php (modified) (1 diff)
• users.php (modified) (1 diff)

trunk/src/wp-admin/edit-comments.php

@@ -192 +192 @@
 }
 
-if ( isset($_REQUEST['s']) && $_REQUEST['s'] ) {
+if ( isset($_REQUEST['s']) && strlen( $_REQUEST['s'] ) ) {
     echo '<span class="subtitle">';
     /* translators: %s: search keywords */

trunk/src/wp-admin/edit-tags.php

@@ -312 +312 @@
 <div class="wrap nosubsub">
 <h1><?php echo esc_html( $title );
-if ( !empty($_REQUEST['s']) )
-    printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
+if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+    /* translators: %s: search keywords */
+    printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( wp_unslash( $_REQUEST['s'] ) ) );
+}
+?>
 </h1>
 

trunk/src/wp-admin/edit.php

@@ -304 +304 @@
 if ( current_user_can( $post_type_object->cap->create_posts ) )
     echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
-if ( ! empty( $_REQUEST['s'] ) )
-    printf( ' <span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() );
+
+if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+    /* translators: %s: search keywords */
+    printf( ' <span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', get_search_query() );
+}
 ?></h1>
 

trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -76 +76 @@
         global $status, $plugins, $totals, $page, $orderby, $order, $s;
 
-        wp_reset_vars( array( 'orderby', 'order', 's' ) );
+        wp_reset_vars( array( 'orderby', 'order' ) );
 
         /**
@@ -225 +225 @@
         }
 
-        if ( $s ) {
+        if ( strlen( $s ) ) {
             $status = 'search';
             $plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
@@ -269 +269 @@
 
     /**
-     * @staticvar string $term
+     * @global string $s
+     *
      * @param array $plugin
      * @return bool
      */
     public function _search_callback( $plugin ) {
-        static $term = null;
-        if ( is_null( $term ) )
-            $term = wp_unslash( $_REQUEST['s'] );
+        global $s;
 
         foreach ( $plugin as $value ) {
-            if ( is_string( $value ) && false !== stripos( strip_tags( $value ), $term ) ) {
+            if ( is_string( $value ) && false !== stripos( strip_tags( $value ), $s ) ) {
                 return true;
             }

trunk/src/wp-admin/link-manager.php

@@ -75 +75 @@
 <div class="wrap nosubsub">
 <h1><?php echo esc_html( $title ); ?> <a href="link-add.php" class="page-title-action"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
-if ( !empty($_REQUEST['s']) )
-    printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
+if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+    /* translators: %s: search keywords */
+    printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( wp_unslash( $_REQUEST['s'] ) ) );
+}
+?>
 </h1>
 

trunk/src/wp-admin/network/sites.php

@@ -289 +289 @@
 <?php endif; ?>
 
-<?php if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) {
+<?php
+if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+    /* translators: %s: search keywords */
     printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
 } ?>

trunk/src/wp-admin/network/themes.php

@@ -240 +240 @@
 <div class="wrap">
 <h1><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="page-title-action"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
-if ( $s )
-    printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
+if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+    /* translators: %s: search keywords */
+    printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
+}
+?>
 </h1>
 

trunk/src/wp-admin/network/users.php

@@ -213 +213 @@
     endif;
 
-    if ( !empty( $usersearch ) )
-    printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
+    if ( strlen( $usersearch ) ) {
+        /* translators: %s: search keywords */
+        printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
+    }
     ?>
     </h1>

trunk/src/wp-admin/plugins.php

@@ -482 +482 @@
 if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
  <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
-<?php }
-if ( $s )
-    printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
+<?php
+}
+
+if ( strlen( $s ) ) {
+    /* translators: %s: search keywords */
+    printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
+}
+?>
 </h1>
 

trunk/src/wp-admin/upload.php

@@ -221 +221 @@
     <a href="media-new.php" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
 }
-if ( ! empty( $_REQUEST['s'] ) )
-    printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
+if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+    /* translators: %s: search keywords */
+    printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', get_search_query() );
+}
+?>
 </h1>
 

trunk/src/wp-admin/users.php

@@ -482 +482 @@
 <?php }
 
-if ( $usersearch )
-    printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) ); ?>
+if ( strlen( $usersearch ) ) {
+    /* translators: %s: search keywords */
+    printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
+}
+?>
 </h1>