Ticket #7552: consolidate-search-query-code.patch

wp-admin/categories.php

@@ -143 +143 @@
 <form class="search-form" action="<?php echo $pagenow ?>" method="get">
 <p class="search-box">
         <label class="hidden" for="post-search-input"><?php _e('Search Categories'); ?>:</label>
-        <input type="text" class="search-input" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+        <input type="text" class="search-input" id="post-search-input" name="s" value="<?php _admin_search_query(); ?>" />
         <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
 </p>
 </form>

wp-admin/edit-comments.php

@@ -176 +176 @@
 <form class="search-form" action="<?php echo $pagenow ?>" method="get">
 <p class="search-box">
         <label class="hidden" for="post-search-input"><?php _e( 'Search Comments' ); ?>:</label>
-        <input type="text" class="search-input" id="post-search-input" name="s" value="<?php echo $search; ?>" />
+        <input type="text" class="search-input" id="post-search-input" name="s" value="<?php _admin_search_query(); ?>" />
         <input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
 </p>
 </form>

wp-admin/edit-link-categories.php

@@ -79 +79 @@
 <form class="search-form" action="<?php echo $pagenow ?>" method="get">
 <p class="search-box">
         <label class="hidden" for="post-search-input"><?php _e( 'Search Categories' ); ?>:</label>
-        <input type="text" class="search-input" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+        <input type="text" class="search-input" id="post-search-input" name="s" value="<?php _admin_search_query(); ?>" />
         <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
 </p>
 </form>

wp-admin/edit-pages.php

@@ -165 +165 @@
 <form class="search-form" action="<?php echo $pagenow ?>" method="get">
 <p class="search-box">
         <label class="hidden" for="post-search-input"><?php _e( 'Search Pages' ); ?>:</label>
-        <input type="text" class="search-input" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+        <input type="text" class="search-input" id="post-search-input" name="s" value="<?php _admin_search_query(); ?>" />
         <input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" />
 </p>
 </form>

wp-admin/edit-tags.php

@@ -146 +146 @@
 <form class="search-form" action="<?php echo $pagenow ?>" method="get">
 <p class="search-box">
         <label class="hidden" for="post-search-input"><?php _e( 'Search Tags' ); ?>:</label>
-        <input type="text" class="search-input" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+        <input type="text" class="search-input" id="post-search-input" name="s" value="<?php _admin_search_query(); ?>" />
         <input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" />
 </p>
 </form>

wp-admin/includes/template.php

@@ -2978 +2978 @@
         return $title;
 }
 
-?>
+/**
+ * Display the search query.
+ * 
+ * A simple wrapper to display the "s" parameter in a GET URI. This function
+ * should only be used when {@link the_search_query()} cannot.
+ *
+ * @uses attribute_escape
+ * @since 2.7.0
+ * 
+ */
+function _admin_search_query() {
+        echo ( isset($_GET['s']) ) ? attribute_escape( stripslashes( $_GET['s'] ) ) : '';
+}
+
+?>
+ No newline at end of file

wp-admin/link-manager.php

@@ -124 +124 @@
 <form class="search-form" action="<?php echo $pagenow ?>" method="get">
 <p class="search-box">
         <label class="hidden" for="post-search-input"><?php _e( 'Search Links' ); ?>:</label>
-        <input type="text" class="search-input" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
+        <input type="text" class="search-input" id="post-search-input" name="s" value="<?php _admin_search_query(); ?>" />
         <input type="submit" value="<?php _e( 'Search Links' ); ?>" class="button" />
 </p>
 </form>