Changeset 4129

Timestamp:

08/30/2006 05:41:38 AM (19 years ago)

Author:

ryan

Message:

Deprecate query_string. Add 'request' filter to filter the array of query vars. Pass around arrays instead of query strings. fixes #2777

File:

• trunk/wp-includes/classes.php (modified) (5 diffs)

trunk/wp-includes/classes.php

@@ -95 +95 @@
         $this->query_vars = array();
 
-        if (! empty($extra_query_vars))
+        if ( is_array($extra_query_vars) )
+            $this->extra_query_vars = & $extra_query_vars;
+        else if (! empty($extra_query_vars))
             parse_str($extra_query_vars, $this->extra_query_vars);
 
@@ -213 +215 @@
             elseif (!empty($perma_query_vars[$wpvar]))
                 $this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
-            else
-                $this->query_vars[$wpvar] = '';
-        }
-
-        for ($i=0; $i<count($this->private_query_vars); $i += 1) {
-            $wpvar = $this->private_query_vars[$i];
-            if (isset($this->extra_query_vars[$wpvar]))
-                $this->query_vars[$wpvar] = $this->extra_query_vars[$wpvar];        
+        }
+
+        foreach ($this->private_query_vars as $var) {
+            if (isset($GLOBALS[$var]) && '' != $GLOBALS[$var] && ! isset($this->extra_query_vars[$var]) )
+                $this->query_vars[$var] = $GLOBALS[$var];
         }
 
         if ( isset($error) )
             $this->query_vars['error'] = $error;
+
+        $this->query_vars = apply_filters('request', $this->query_vars);
 
         do_action('parse_request', array(&$this));
@@ -273 +274 @@
     function build_query_string() {
         $this->query_string = '';
-
         foreach (array_keys($this->query_vars) as $wpvar) {
             if ( '' != $this->query_vars[$wpvar] ) {
@@ -281 +281 @@
         }
 
-        foreach ($this->private_query_vars as $wpvar) {
-            if (isset($GLOBALS[$wpvar]) && '' != $GLOBALS[$wpvar] && ! isset($this->extra_query_vars[$wpvar]) ) {
-                $this->query_string .= (strlen($this->query_string) < 1) ? '' : '&';
-                $this->query_string .= $wpvar . '=' . rawurlencode($GLOBALS[$wpvar]);
-            }
-        }
-
-        $this->query_string = apply_filters('query_string', $this->query_string);
+        // query_string filter deprecated.  Use request filter instead.
+        global $wp_filter;
+        if ( isset($wp_filter['query_string']) ) {  // Don't bother filtering and parsing if no plugins are hooked in.
+            $this->query_string = apply_filters('query_string', $this->query_string);
+            parse_str($this->query_string, $this->query_vars);
+        }
     }
 
@@ -315 +313 @@
     function query_posts() {
         $this->build_query_string();
-        query_posts($this->query_string);
+        query_posts($this->query_vars);
     }