Plugins: Remove slashes from search terms and use urldecode() in non-URL contexts.

ocean90 · ocean90 · commit 479596acda08 · 2016-02-17T20:14:37.000Z
Fixes #35712. git-svn-id: https://develop.svn.wordpress.org/trunk@36560 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-admin/includes/class-wp-plugins-list-table.php b/src/wp-admin/includes/class-wp-plugins-list-table.php
@@ -268,7 +268,7 @@ public function prepare_items() {
 	}
 
 	/**
-	 * @global string $s
+	 * @global string $s URL encoded search term.
 	 *
 	 * @param array $plugin
 	 * @return bool
@@ -277,7 +277,7 @@ public function _search_callback( $plugin ) {
 		global $s;
 
 		foreach ( $plugin as $value ) {
-			if ( is_string( $value ) && false !== stripos( strip_tags( $value ), $s ) ) {
+			if ( is_string( $value ) && false !== stripos( strip_tags( $value ), urldecode( $s ) ) ) {
 				return true;
 			}
 		}
@@ -316,7 +316,7 @@ public function no_items() {
 		global $plugins;
 
 		if ( ! empty( $_REQUEST['s'] ) ) {
-			$s = esc_html( $_REQUEST['s'] );
+			$s = esc_html( wp_unslash( $_REQUEST['s'] ) );
 
 			printf( __( 'No plugins found for &#8220;%s&#8221;.' ), $s );
 
diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php
@@ -18,7 +18,7 @@
 $action = $wp_list_table->current_action();
 
 $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
-$s = isset($_REQUEST['s']) ? urlencode($_REQUEST['s']) : '';
+$s = isset($_REQUEST['s']) ? urlencode( wp_unslash( $_REQUEST['s'] ) ) : '';
 
 // Clean up request URI from temporary args for screen options/paging uri's to work as expected.
 $_SERVER['REQUEST_URI'] = remove_query_arg(array('error', 'deleted', 'activate', 'activate-multi', 'deactivate', 'deactivate-multi', '_error_nonce'), $_SERVER['REQUEST_URI']);
@@ -486,7 +486,7 @@
 
 if ( strlen( $s ) ) {
 	/* translators: %s: search keywords */
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $s ) );
+	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( urldecode( $s ) ) );
 }
 ?>
 </h1>

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ public function prepare_items() {`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`/**`
`271`		`- * @global string $s`
	`271`	`+ * @global string $s URL encoded search term.`
`272`	`272`	`*`
`273`	`273`	`* @param array $plugin`
`274`	`274`	`* @return bool`
`@@ -277,7 +277,7 @@ public function _search_callback( $plugin ) {`
`277`	`277`	`global $s;`
`278`	`278`
`279`	`279`	`foreach ( $plugin as $value ) {`
`280`		`- if ( is_string( $value ) && false !== stripos( strip_tags( $value ), $s ) ) {`
	`280`	`+ if ( is_string( $value ) && false !== stripos( strip_tags( $value ), urldecode( $s ) ) ) {`
`281`	`281`	`return true;`
`282`	`282`	`}`
`283`	`283`	`}`
`@@ -316,7 +316,7 @@ public function no_items() {`
`316`	`316`	`global $plugins;`
`317`	`317`
`318`	`318`	`if ( ! empty( $_REQUEST['s'] ) ) {`
`319`		`- $s = esc_html( $_REQUEST['s'] );`
	`319`	`+ $s = esc_html( wp_unslash( $_REQUEST['s'] ) );`
`320`	`320`
`321`	`321`	`printf( __( 'No plugins found for “%s”.' ), $s );`
`322`	`322`