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

Timestamp:

09/21/2006 09:05:38 PM (19 years ago)

Author:

ryan

Message:

Make sure query vars are set before use. Props Alex King. fixes #3154

File:

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

trunk/wp-includes/query.php

@@ -330 +330 @@
         $this->parse_query('');
     }
+    
+    function fill_query_vars($array) {
+        $keys = array(
+            'error'
+            , 'm'
+            , 'p'
+            , 'subpost'
+            , 'subpost_id'
+            , 'attachment'
+            , 'attachment_id'
+            , 'name'
+            , 'hour'
+            , 'static'
+            , 'pagename'
+            , 'page_id'
+            , 'second'
+            , 'minute'
+            , 'hour'
+            , 'day'
+            , 'monthnum'
+            , 'year'
+            , 'w'
+            , 'category_name'
+            , 'author_name'
+            , 'feed'
+            , 'tb'
+            , 'paged'
+            , 'comments_popup'
+            , 'preview'
+        );
+
+        foreach ($keys as $key) {
+            if ( !isset($array[$key]))
+                $array[$key] = '';
+        }
+        
+        return $array;
+    }
 
     // Parse a query string and set query type booleans.
@@ -342 +380 @@
             $this->query_vars = $qv;
         }
-
+        
+        $qv = $this->fill_query_vars($qv);
+        
         if ( ! empty($qv['robots']) ) {
             $this->is_robots = true;
@@ -531 +571 @@
         // Shorthand.
         $q = &$this->query_vars;
+        
+        $q = $this->fill_query_vars($q);
 
         // First let's clear some variables
@@ -541 +583 @@
         $limits = '';
         $join = '';
+        $search = '';
 
         if ( !isset($q['post_type']) )
@@ -910 +953 @@
 
             if (($q['what_to_show'] == 'posts')) {
-                $q['offset'] = abs(intval($q['offset']));
                 if ( empty($q['offset']) ) {
                     $pgstrt = '';
@@ -916 +958 @@
                     $limits = 'LIMIT '.$pgstrt.$q['posts_per_page'];
                 } else { // we're ignoring $page and using 'offset'
+                    $q['offset'] = abs(intval($q['offset']));
                     $pgstrt = $q['offset'] . ', ';
                     $limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];