Ticket #31025: 31025.2.diff

src/wp-admin/edit-comments.php

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

src/wp-admin/edit-tags.php

@@ -311 +311 @@
 
 <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>
 
 <?php if ( $message ) : ?>

src/wp-admin/edit.php

@@ -303 +303 @@
 echo esc_html( $post_type_object->labels->name );
 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>
 
 <?php

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

@@ -75 +75 @@
         public function prepare_items() {
                 global $status, $plugins, $totals, $page, $orderby, $order, $s;
 
-                wp_reset_vars( array( 'orderby', 'order', 's' ) );
+                wp_reset_vars( array( 'orderby', 'order' ) );
 
                 /**
                  * Filter the full array of plugins to list in the Plugins list table.
@@ -224 +224 @@
                         }
                 }
 
-                if ( $s ) {
+                if ( strlen( $s ) ) {
                         $status = 'search';
                         $plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
                 }
@@ -268 +268 @@
         }
 
         /**
-         * @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 ( false !== stripos( strip_tags( $value ), $term ) ) {
+                        if ( is_string( $value ) && false !== stripos( strip_tags( $value ), $s ) ) {
                                 return true;
                         }
                 }

src/wp-admin/link-manager.php

@@ -74 +74 @@
 
 <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>
 
 <?php

src/wp-admin/network/sites.php

@@ -288 +288 @@
         <a href="<?php echo network_admin_url('site-new.php'); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'site' ); ?></a>
 <?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 ) );
 } ?>
 </h1>

src/wp-admin/network/themes.php

@@ -239 +239 @@
 
 <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>
 
 <?php

src/wp-admin/network/users.php

@@ -212 +212 @@
                 <a href="<?php echo network_admin_url('user-new.php'); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
         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>
 

src/wp-admin/plugins.php

@@ -481 +481 @@
 <h1><?php echo esc_html( $title );
 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>
 
 <?php

src/wp-admin/upload.php

@@ -220 +220 @@
 if ( current_user_can( 'upload_files' ) ) { ?>
         <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>
 
 <?php

src/wp-admin/users.php

@@ -481 +481 @@
         <a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
 <?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>
 
 <?php $wp_list_table->views(); ?>