Changeset 23554 for trunk/wp-includes/query.php

Timestamp:

03/01/2013 04:28:40 PM (12 years ago)

Author:

ryan

Message:

Revert 23416, 23419, 23445 except for wp_reset_vars() changes. We are going a different direction with the slashing cleanup, so resetting to a clean slate. see #21767

File:

• trunk/wp-includes/query.php (modified) (4 diffs)

trunk/wp-includes/query.php

@@ -1734 +1734 @@
         if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular && $this->query_vars_changed ) {
             $q['cat'] = ''.urldecode($q['cat']).'';
+            $q['cat'] = addslashes_gpc($q['cat']);
             $cat_array = preg_split('/[,\s]+/', $q['cat']);
             $q['cat'] = '';
@@ -2187 +2188 @@
         // If a search pattern is specified, load the posts that match
         if ( !empty($q['s']) ) {
+            // added slashes screw with quote grouping when done early, so done later
+            $q['s'] = stripslashes($q['s']);
             if ( empty( $_GET['s'] ) && $this->is_main_query() )
                 $q['s'] = urldecode($q['s']);
@@ -2295 +2298 @@
         } else {
             $q['author'] = (string)urldecode($q['author']);
+            $q['author'] = addslashes_gpc($q['author']);
             if ( strpos($q['author'], '-') !== false ) {
                 $eq = '!=';
@@ -2358 +2362 @@
             }
             $q['orderby'] = urldecode($q['orderby']);
+            $q['orderby'] = addslashes_gpc($q['orderby']);
 
             $orderby_array = array();