Ticket #3154: patch.diff

query.php

@@ -329 +329 @@
         function parse_query_vars() {
                 $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.
         function parse_query ($query) {
                 if ( !empty($query) || !isset($this->query) ) {
@@ -341 +379 @@
                         $this->query = $query;
                         $this->query_vars = $qv;
                 }
-
+                
+                $qv = $this->fill_query_vars($qv);
+                
                 if ( ! empty($qv['robots']) ) {
                         $this->is_robots = true;
                         return;
@@ -530 +570 @@
 
                 // Shorthand.
                 $q = &$this->query_vars;
+                
+                $q = $this->fill_query_vars($q);
 
                 // First let's clear some variables
                 $distinct = '';
@@ -540 +582 @@
                 $where = '';
                 $limits = '';
                 $join = '';
+                $search = '';
 
                 if ( !isset($q['post_type']) )
                         $q['post_type'] = 'post';
@@ -909 +952 @@
                         }
 
                         if (($q['what_to_show'] == 'posts')) {
-                                $q['offset'] = abs(intval($q['offset']));
                                 if ( empty($q['offset']) ) {
                                         $pgstrt = '';
                                         $pgstrt = (intval($page) -1) * $q['posts_per_page'] . ', ';
                                         $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'];
                                 }