Changeset 1516

Timestamp:

08/08/2004 03:31:50 PM (21 years ago)

Author:

rboren

Message:

WP Query class.

Location:

trunk

Files:

• index.php (modified) (2 diffs)
• wp-blog-header.php (modified) (1 diff)
• wp-includes/classes.php (modified) (2 diffs)
• wp-includes/functions.php (modified) (3 diffs)

trunk/index.php

@@ -32 +32 @@
 
 <div id="content">
-<?php if ($posts) : foreach ($posts as $post) : start_wp(); ?>
+<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
 
 <?php the_date('','<h2>','</h2>'); ?>
@@ -57 +57 @@
 <?php comments_template(); // Get wp-comments.php template ?>
 
-<?php endforeach; else: ?>
+<?php endwhile; else: ?>
 <p><?php _e('Sorry, no posts matched your criteria.'); ?></p>
 <?php endif; ?>

trunk/wp-blog-header.php

@@ -142 +142 @@
 $query_string = apply_filters('query_string', $query_string);
 
-$wp_query_state->parse_query($query_string);
-
 update_category_cache();
 

trunk/wp-includes/classes.php

@@ -1 +1 @@
 <?php
 
-class WP_Query_State {
-    var $single = false;
-    var $archive = false;
-    var $date = false;
-    var $author = false;
-    var $category = false;
-    var $search = false;
-    var $feed = false;
-    var $home = false;
-    
+class WP_Query {
+    var $query;
+    var $query_vars;
+
+    var $posts;
+    var $post_count = 0;
+    var $current_post = -1;
+    var $post;
+
+    var $is_single = false;
+    var $is_archive = false;
+    var $is_date = false;
+    var $is_author = false;
+    var $is_category = false;
+    var $is_search = false;
+    var $is_feed = false;
+    var $is_home = false;
+
     function init () {
-        $this->single = false;
-        $this->archive = false;
-        $this->date = false;
-        $this->author = false;
-        $this->category = false;
-        $this->search = false;
-        $this->feed = false;
-        $this->home = false;
+        $this->is_single = false;
+        $this->is_archive = false;
+        $this->is_date = false;
+        $this->is_author = false;
+        $this->is_category = false;
+        $this->is_search = false;
+        $this->is_feed = false;
+        $this->is_home = false;
+
+        unset($this->posts);
+        unset($this->query);
+        unset($this->query_vars);
+        $this->post_count = 0;
+        $this->current_post = -1;
     }
 
     function parse_query ($query) {
-        parse_str($query);
         $this->init();
-
-        if ('' != $name) {
-            $this->single = true;
-        }
-
-        if (($p != '') && ($p != 'all')) {
-            $this->single = true;
-        }
-
-        if ('' != $m) {
-            $this->date = true;
-        }
-
-        if ('' != $hour) {
-            $this->date = true;            
-        }
-
-        if ('' != $minute) {
-            $this->date = true;
-        }
-
-        if ('' != $second) {
-            $this->date = true;
-        }
-
-        if ('' != $year) {
-            $this->date = true;
-        }
-
-        if ('' != $monthnum) {
-            $this->date = true;
-        }
-
-        if ('' != $day) {
-            $this->date = true;
-        }
-
-        if ('' != $w) {
-            $this->date = true;
+        parse_str($query, $qv);
+        $this->query = $query;
+        $this->query_vars = $qv;
+
+        if ('' != $qv['name']) {
+            $this->is_single = true;
+        }
+
+        if (($qv['p'] != '') && ($qv['p'] != 'all')) {
+            $this->is_single = true;            
+        }
+
+        if ('' != $qv['m']) {
+            $this->is_date = true;
+        }
+
+        if ('' != $qv['hour']) {
+            $this->is_date = true;            
+        }
+
+        if ('' != $qv['minute']) {
+            $this->is_date = true;
+        }
+
+        if ('' != $qv['second']) {
+            $this->is_date = true;
+        }
+
+        if ('' != $qv['year']) {
+            $this->is_date = true;
+        }
+
+        if ('' != $qv['monthnum']) {
+            $this->is_date = true;
+        }
+
+        if ('' != $qv['day']) {
+            $this->is_date = true;
+        }
+
+        if ('' != $qv['w']) {
+            $this->is_date = true;
         }
 
         // If year, month, day, hour, minute, and second are set, a single 
         // post is being queried.        
-        if (('' != $hour) && ('' != $minute) &&('' != $second) && ('' != $year) && ('' != $monthnum) && ('' != $day)) {
-            $this->single = true;
-        }
-
-        if (!empty($s)) {
-            $this->search = true;
-        }
-
-        if (empty($cat) || ($cat == 'all') || ($cat == '0')) {
-            $this->category = false;
+        if (('' != $qv['hour']) && ('' != $qv['minute']) &&('' != $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day'])) {
+            $this->is_single = true;
+        }
+
+        if (!empty($qv['s'])) {
+            $this->is_search = true;
+        }
+
+        if (empty($qv['cat']) || ($qv['cat'] == 'all') || ($qv['cat'] == '0')) {
+            $this->is_category = false;
         } else {
-            if (stristr($cat,'-')) {
-                $this->category = false;
+            if (stristr($qv['cat'],'-')) {
+                $this->is_category = false;
             } else {
-                $this->category = true;
-            }
-        }
-
-        if ('' != $category_name) {
-            $this->category = true;
+                $this->is_category = true;
+            }
+        }
+
+        if ('' != $qv['category_name']) {
+            $this->is_category = true;
         }
             
         // single, date, and search override category.
-        if ($this->single || $this->date || $this->search) {
-            $this->category = false;                
-        }
-
-        if ((empty($author)) || ($author == 'all') || ($author == '0')) {
-            $this->author = false;
+        if ($this->is_single || $this->is_date || $this->is_search) {
+            $this->is_category = false;                
+        }
+
+        if ((empty($qv['author'])) || ($qv['author'] == 'all') || ($qv['author'] == '0')) {
+            $this->is_author = false;
         } else {
-            $this->author = true;
-        }
-
-        if ('' != $author_name) {
-            $this->author = true;
-        }
-
-        if ('' != $feed) {
-            $this->feed = true;
-        }
-
-        if ( ($this->date || $this->author || $this->category)
-             && (! $this->single)) {
-            $this->archive = true;
-        }
-
-        if ( ! ($this->archive || $this->single || $this->search || $this->feed)) {
-            $this->home = true;
-        }
-
-    }
-
-    function WP_Query_State ($query = '') {
+            $this->is_author = true;
+        }
+
+        if ('' != $qv['author_name']) {
+            $this->is_author = true;
+        }
+
+        if ('' != $qv['feed']) {
+            $this->is_feed = true;
+            $this->feed = $qv['feed'];
+        }
+
+        if ( ($this->is_date || $this->is_author || $this->is_category)
+             && (! $this->is_single)) {
+            $this->is_archive = true;
+        }
+
+        if ( ! ($this->is_archive || $this->is_single || $this->is_search || $this->is_feed)) {
+            $this->is_home = true;
+        }
+    }
+
+    function get($query_var) {
+        if (isset($this->query_vars[$query_var])) {
+            return $this->query_vars[$query_var];
+        }
+
+        return '';
+    }
+
+    function get_posts() {
+        global $wpdb, $pagenow, $request, $user_ID;
+
+    // Shorthand.
+    $q = $this->query_vars; 
+
+        // First let's clear some variables
+        $whichcat = '';
+        $whichauthor = '';
+        $result = '';
+        $where = '';
+        $limits = '';
+        $distinct = '';
+        $join = '';
+
+    if ( !isset($q['posts_per_page']) || $q['posts_per_page'] == 0 )
+      $q['posts_per_page'] = get_settings('posts_per_page');
+    if ( !isset($q['what_to_show']) )
+      $q['what_to_show'] = get_settings('what_to_show');
+    if ( isset($q['showposts']) && $q['showposts'] ) {
+      $q['showposts'] = (int) $q['showposts'];
+      $q['posts_per_page'] = $q['showposts'];
+    }
+
+        $add_hours = intval(get_settings('gmt_offset'));
+        $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
+        $wp_posts_post_date_field = "post_date"; // "DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)";
+
+        // If a month is specified in the querystring, load that month
+        if ('' != $q['m']) {
+            $q['m'] = '' . preg_replace('|[^0-9]|', '', $q['m']);
+            $where .= ' AND YEAR(post_date)=' . substr($q['m'], 0, 4);
+            if (strlen($q['m'])>5)
+                $where .= ' AND MONTH(post_date)=' . substr($q['m'], 4, 2);
+            if (strlen($q['m'])>7)
+                $where .= ' AND DAYOFMONTH(post_date)=' . substr($q['m'], 6, 2);
+            if (strlen($q['m'])>9)
+                $where .= ' AND HOUR(post_date)=' . substr($q['m'], 8, 2);
+            if (strlen($q['m'])>11)
+                $where .= ' AND MINUTE(post_date)=' . substr($q['m'], 10, 2);
+            if (strlen($q['m'])>13)
+                $where .= ' AND SECOND(post_date)=' . substr($q['m'], 12, 2);
+        }
+
+        if ('' != $q['hour']) {
+            $q['hour'] = '' . intval($q['hour']);
+            $where .= " AND HOUR(post_date)='" . $q['hour'] . "'";
+        }
+
+        if ('' != $q['minute']) {
+            $q['minute'] = '' . intval($q['minute']);
+            $where .= " AND MINUTE(post_date)='" . $q['minute'] . "'";
+        }
+
+        if ('' != $q['second']) {
+            $q['second'] = '' . intval($q['second']);
+            $where .= " AND SECOND(post_date)='" . $q['second'] . "'";
+        }
+
+        if ('' != $q['year']) {
+            $q['year'] = '' . intval($q['year']);
+            $where .= " AND YEAR(post_date)='" . $q['year'] . "'";
+        }
+
+        if ('' != $q['monthnum']) {
+            $q['monthnum'] = '' . intval($q['monthnum']);
+            $where .= " AND MONTH(post_date)='" . $q['monthnum'] . "'";
+        }
+
+        if ('' != $q['day']) {
+            $q['day'] = '' . intval($q['day']);
+            $where .= " AND DAYOFMONTH(post_date)='" . $q['day'] . "'";
+        }
+
+        if ('' != $q['name']) {
+            $q['name'] = preg_replace('/[^a-z0-9-_]/', '', $q['name']);
+            $where .= " AND post_name = '" . $q['name'] . "'";
+        }
+
+        if ('' != $q['w']) {
+            $q['w'] = ''.intval($q['w']);
+            $where .= " AND WEEK(post_date, 1)='" . $q['w'] . "'";
+        }
+
+        // If a post number is specified, load that post
+        if (($q['p'] != '') && ($q['p'] != 'all')) {
+            $q['p'] = intval($q['p']);
+            $where = ' AND ID = '.$q['p'];
+        }
+
+        // If a search pattern is specified, load the posts that match
+        if (!empty($q['s'])) {
+            $q['s'] = addslashes_gpc($q['s']);
+            $search = ' AND (';
+            $q['s'] = preg_replace('/, +/', ' ', $q['s']);
+            $q['s'] = str_replace(',', ' ', $q['s']);
+            $q['s'] = str_replace('"', ' ', $q['s']);
+            $q['s'] = trim($q['s']);
+            if ($q['exact']) {
+                $n = '';
+            } else {
+                $n = '%';
+            }
+            if (!$q['sentence']) {
+                $s_array = explode(' ',$q['s']);
+                $search .= '((post_title LIKE \''.$n.$s_array[0].$n.'\') OR (post_content LIKE \''.$n.$s_array[0].$n.'\'))';
+                for ( $i = 1; $i < count($s_array); $i = $i + 1) {
+                    $search .= ' AND ((post_title LIKE \''.$n.$s_array[$i].$n.'\') OR (post_content LIKE \''.$n.$s_array[$i].$n.'\'))';
+                }
+                $search .= ' OR (post_title LIKE \''.$n.$q['s'].$n.'\') OR (post_content LIKE \''.$n.$q['s'].$n.'\')';
+                $search .= ')';
+            } else {
+                $search = ' AND ((post_title LIKE \''.$n.$q['s'].$n.'\') OR (post_content LIKE \''.$n.$q['s'].$n.'\'))';
+            }
+        }
+
+        // Category stuff
+
+        if ((empty($q['cat'])) || ($q['cat'] == 'all') || ($q['cat'] == '0') || 
+            // Bypass cat checks if fetching specific posts
+            (
+             intval($q['year']) || intval($q['monthnum']) || intval($q['day']) || intval($q['w']) ||
+             intval($q['p']) || !empty($q['name']) || !empty($q['s'])
+             )
+            ) {
+            $whichcat='';
+        } else {
+            $q['cat'] = ''.urldecode($q['cat']).'';
+            $q['cat'] = addslashes_gpc($q['cat']);
+            if (stristr($q['cat'],'-')) {
+                // Note: if we have a negative, we ignore all the positives. It must
+                // always mean 'everything /except/ this one'. We should be able to do
+                // multiple negatives but we don't :-(
+                $eq = '!=';
+                $andor = 'AND';
+                $q['cat'] = explode('-',$q['cat']);
+                $q['cat'] = intval($q['cat'][1]);
+            } else {
+                $eq = '=';
+                $andor = 'OR';
+            }
+            $join = " LEFT JOIN $wpdb->post2cat ON ($wpdb->posts.ID = $wpdb->post2cat.post_id) ";
+            $cat_array = explode(' ',$q['cat']);
+            $whichcat .= ' AND (category_id '.$eq.' '.intval($cat_array[0]);
+            $whichcat .= get_category_children($cat_array[0], ' '.$andor.' category_id '.$eq.' ');
+            for ($i = 1; $i < (count($cat_array)); $i = $i + 1) {
+                $whichcat .= ' '.$andor.' category_id '.$eq.' '.intval($cat_array[$i]);
+                $whichcat .= get_category_children($cat_array[$i], ' '.$andor.' category_id '.$eq.' ');
+            }
+            $whichcat .= ')';
+            if ($eq == '!=') {
+                $q['cat'] = '-'.$q['cat']; // Put back the knowledge that we are excluding a category.
+            }
+        }
+
+        // Category stuff for nice URIs
+
+        if ('' != $q['category_name']) {
+            if (stristr($q['category_name'],'/')) {
+                $q['category_name'] = explode('/',$q['category_name']);
+                if ($q['category_name'][count($q['category_name'])-1]) {
+                    $q['category_name'] = $q['category_name'][count($q['category_name'])-1]; // no trailing slash
+                } else {
+                    $q['category_name'] = $q['category_name'][count($q['category_name'])-2]; // there was a trailling slash
+                }
+            }
+            $q['category_name'] = preg_replace('|[^a-z0-9-_]|i', '', $q['category_name']);
+            $tables = ", $wpdb->post2cat, $wpdb->categories";
+            $join = " LEFT JOIN $wpdb->post2cat ON ($wpdb->posts.ID = $wpdb->post2cat.post_id) LEFT JOIN $wpdb->categories ON ($wpdb->post2cat.category_id = $wpdb->categories.cat_ID) ";
+            $whichcat = " AND (category_nicename = '" . $q['category_name'] . "'";
+            $q['cat'] = $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '" . $q['category_name'] . "'");
+            $whichcat .= get_category_children($q['cat'], " OR category_id = ");
+            $whichcat .= ")";
+        }
+
+        // Author/user stuff
+
+        if ((empty($q['author'])) || ($q['author'] == 'all') || ($q['author'] == '0')) {
+            $whichauthor='';
+        } else {
+            $q['author'] = ''.urldecode($q['author']).'';
+            $q['author'] = addslashes_gpc($q['author']);
+            if (stristr($q['author'], '-')) {
+                $eq = '!=';
+                $andor = 'AND';
+                $q['author'] = explode('-', $q['author']);
+                $q['author'] = ''.intval($q['author'][1]);
+            } else {
+                $eq = '=';
+                $andor = 'OR';
+            }
+            $author_array = explode(' ', $q['author']);
+            $whichauthor .= ' AND (post_author '.$eq.' '.intval($author_array[0]);
+            for ($i = 1; $i < (count($author_array)); $i = $i + 1) {
+                $whichauthor .= ' '.$andor.' post_author '.$eq.' '.intval($author_array[$i]);
+            }
+            $whichauthor .= ')';
+        }
+
+        // Author stuff for nice URIs
+
+        if ('' != $q['author_name']) {
+            if (stristr($q['author_name'],'/')) {
+                $q['author_name'] = explode('/',$q['author_name']);
+                if ($q['author_name'][count($q['author_name'])-1]) {
+                    $q['author_name'] = $q['author_name'][count($q['author_name'])-1];#no trailing slash
+                } else {
+                    $q['author_name'] = $q['author_name'][count($q['author_name'])-2];#there was a trailling slash
+                }
+            }
+            $q['author_name'] = preg_replace('|[^a-z0-9-_]|', '', strtolower($q['author_name']));
+            $q['author'] = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_nicename='".$q['author_name']."'");
+            $whichauthor .= ' AND (post_author = '.intval($q['author']).')';
+        }
+
+        $where .= $search.$whichcat.$whichauthor;
+
+        if ((empty($q['order'])) || ((strtoupper($q['order']) != 'ASC') && (strtoupper($q['order']) != 'DESC'))) {
+            $q['order']='DESC';
+        }
+
+        // Order by
+        if (empty($q['orderby'])) {
+            $q['orderby']='date '.$q['order'];
+        } else {
+            // Used to filter values
+            $allowed_keys = array('author','date','category','title');
+            $q['orderby'] = urldecode($q['orderby']);
+            $q['orderby'] = addslashes_gpc($q['orderby']);
+            $orderby_array = explode(' ',$q['orderby']);
+            if (!in_array($orderby_array[0],$allowed_keys)) {
+                $orderby_array[0] = 'date';
+            }
+            $q['orderby'] = $orderby_array[0].' '.$q['order'];
+            if (count($orderby_array)>1) {
+                for ($i = 1; $i < (count($orderby_array)); $i = $i + 1) {
+                    // Only allow certain values for safety
+                    if (in_array($orderby_array[$i],$allowed_keys)) {
+                        $q['orderby'] .= ',post_'.$orderby_array[$i].' '.$q['order'];
+                    }
+                }
+            }
+        }
+
+        if ((!$whichcat) && (!$q['m']) && (!$q['p']) && (!$q['w']) && (!$q['s']) && empty($q['poststart']) && empty($q['postend'])) {
+            if ($q['what_to_show'] == 'posts') {
+                $limits = ' LIMIT '.$q['posts_per_page'];
+            } elseif ($q['what_to_show'] == 'days' && empty($q['monthnum']) && empty($q['year']) && empty($q['day'])) {
+                $lastpostdate = get_lastpostdate();
+                $lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate);
+                $lastpostdate = mysql2date('U',$lastpostdate);
+                $otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($q['posts_per_page']-1) * 86400)));
+                $where .= " AND post_date > '$otherdate'";
+            }
+        }
+
+        if ( !empty($q['postend']) && ($q['postend'] > $q['poststart']) && (!$q['m']) && empty($q['monthnum']) && empty($q['year']) && empty($q['day']) &&(!$q['w']) && (!$whichcat) && (!$q['s']) && (!$q['p'])) {
+            if ($q['what_to_show'] == 'posts') {
+                $q['poststart'] = intval($q['poststart']);
+                $q['postend'] = intval($q['postend']);
+                $limposts = $q['postend'] - $q['poststart'];
+                $limits = ' LIMIT '.$q['poststart'].','.$limposts;
+            } elseif ($q['what_to_show'] == 'days') {
+                $q['poststart'] = intval($q['poststart']);
+                $q['postend'] = intval($q['postend']);
+                $limposts = $q['postend'] - $q['poststart'];
+                $lastpostdate = get_lastpostdate();
+                $lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate);
+                $lastpostdate = mysql2date('U',$lastpostdate);
+                $startdate = date('Y-m-d H:i:s', ($lastpostdate - (($q['poststart'] -1) * 86400)));
+                $otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($q['postend'] -1) * 86400)));
+                $where .= " AND post_date > '$otherdate' AND post_date < '$startdate'";
+            }
+        } else {
+            if (($q['what_to_show'] == 'posts') && (! is_single()) && (!$q['more'])) {
+                if ($pagenow != 'post.php') {
+                    $pgstrt = '';
+                    if ($q['paged']) {
+                        $pgstrt = (intval($q['paged']) -1) * $q['posts_per_page'] . ', ';
+                    }
+                    $limits = 'LIMIT '.$pgstrt.$q['posts_per_page'];
+                } else {
+                    if (($q['m']) || ($q['p']) || ($q['w']) || ($q['s']) || ($whichcat)) {
+                        $limits = '';
+                    } else {
+                        $pgstrt = '';
+                        if ($q['paged']) {
+                            $pgstrt = (intval($q['paged']) -1) * $q['posts_per_page'] . ', ';
+                        }
+                        $limits = 'LIMIT '.$pgstrt.$q['posts_per_page'];
+                    }
+                }
+            }
+            elseif (($q['m']) || ($q['p']) || ($q['w']) || ($q['s']) || ($whichcat) || ($q['author']) || $q['monthnum'] || $q['year'] || $q['day']) {
+                $limits = '';
+            }
+        }
+
+        if ($q['p'] == 'all') {
+            $where = '';
+        }
+
+        $now = gmdate('Y-m-d H:i:59');
+
+        if ($pagenow != 'post.php' && $pagenow != 'edit.php') {
+            if ((empty($q['poststart'])) || (empty($q['postend'])) || !($q['postend'] > $q['poststart'])) {
+                $where .= " AND post_date_gmt <= '$now'";
+            }
+
+            $distinct = 'DISTINCT';
+        }
+        $where .= ' AND (post_status = "publish"';
+
+        // Get private posts
+        if (isset($user_ID) && ('' != intval($user_ID)))
+            $where .= " OR post_author = $user_ID AND post_status != 'draft')";
+        else
+            $where .= ')';
+
+        $where = apply_filters('posts_where', $where);
+        $where .= " GROUP BY $wpdb->posts.ID";
+        $request = " SELECT $distinct * FROM $wpdb->posts $join WHERE 1=1".$where." ORDER BY post_" . $q['orderby'] . " $limits";
+
+
+        if ($q['preview']) {
+            $request = 'SELECT 1-1'; // dummy mysql query for the preview
+            // little funky fix for IEwin, rawk on that code
+            $is_winIE = ((preg_match('/MSIE/',$HTTP_USER_AGENT)) && (preg_match('/Win/',$HTTP_USER_AGENT)));
+            if (($is_winIE) && (!isset($IEWin_bookmarklet_fix))) {
+                $preview_content =  preg_replace('/\%u([0-9A-F]{4,4})/e',  "'&#'.base_convert('\\1',16,10).';'", $preview_content);
+            }
+        }
+
+        $this->posts = $wpdb->get_results($request);
+        $this->posts = apply_filters('the_posts', $this->posts);
+        $this->post_count = count($this->posts);
+        if ($this->post_count > 0) {
+            $this->post = $posts[0];
+        }
+
+        update_post_caches($this->posts);
+        return $this->posts;
+    }
+
+    function next_post() {
+        
+        $this->current_post++;
+
+        $this->post = $this->posts[$this->current_post];
+        return $this->post;
+    }
+
+    function have_posts() {
+        if ($this->current_post + 1 < $this->post_count) {
+            return true;
+        }
+
+        return false;
+    }
+    
+    function query($query) {
+        $this->parse_query($query);
+        return $this->get_posts();
+    }
+
+    function WP_Query ($query = '') {
         if (! empty($query)) {
-            $this->parse_query($query);
+            $this->query($query);
         }
     }
@@ -128 +517 @@
 
 // Make a global instance.
-if (! isset($wp_query_state)) {
-    $wp_query_state = new WP_Query_State();
+if (! isset($wp_query)) {
+    $wp_query = new WP_Query();
 }
 

trunk/wp-includes/functions.php

@@ -1037 +1037 @@
 
 
-function start_wp() {
-    global $post, $id, $postdata, $authordata, $day, $preview, $page, $pages, $multipage, $more, $numpages;
+function start_wp($use_wp_query = false) {
+  global $post, $id, $postdata, $authordata, $day, $preview, $page, $pages, $multipage, $more, $numpages, $wp_query;
     global $pagenow;
+
+    if ($use_wp_query) {
+      $post = $wp_query->next_post();
+    } else {
+      $wp_query->next_post();
+    }
+
     if (!$preview) {
         $id = $post->ID;
@@ -1432 +1439 @@
 
 function query_posts($query) {
-    global $wpdb, $pagenow, $request, $user_ID;
-
-    parse_str($query);
-
-    // First let's clear some variables
-    $whichcat = '';
-    $whichauthor = '';
-    $result = '';
-    $where = '';
-    $limits = '';
-    $distinct = '';
-    $join = '';
-
-    $add_hours = intval(get_settings('gmt_offset'));
-    $add_minutes = intval(60 * (get_settings('gmt_offset') - $add_hours));
-    $wp_posts_post_date_field = "post_date"; // "DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)";
-
-    // If a month is specified in the querystring, load that month
-    if ('' != $m) {
-        $m = '' . preg_replace('|[^0-9]|', '', $m);
-        $where .= ' AND YEAR(post_date)=' . substr($m, 0, 4);
-        if (strlen($m)>5)
-            $where .= ' AND MONTH(post_date)=' . substr($m, 4, 2);
-        if (strlen($m)>7)
-            $where .= ' AND DAYOFMONTH(post_date)=' . substr($m, 6, 2);
-        if (strlen($m)>9)
-            $where .= ' AND HOUR(post_date)=' . substr($m, 8, 2);
-        if (strlen($m)>11)
-            $where .= ' AND MINUTE(post_date)=' . substr($m, 10, 2);
-        if (strlen($m)>13)
-            $where .= ' AND SECOND(post_date)=' . substr($m, 12, 2);
-    }
-
-    if ('' != $hour) {
-        $hour = '' . intval($hour);
-        $where .= " AND HOUR(post_date)='$hour'";
-    }
-
-    if ('' != $minute) {
-        $minute = '' . intval($minute);
-        $where .= " AND MINUTE(post_date)='$minute'";
-    }
-
-    if ('' != $second) {
-        $second = '' . intval($second);
-        $where .= " AND SECOND(post_date)='$second'";
-    }
-
-    if ('' != $year) {
-        $year = '' . intval($year);
-        $where .= " AND YEAR(post_date)='$year'";
-    }
-
-    if ('' != $monthnum) {
-        $monthnum = '' . intval($monthnum);
-        $where .= " AND MONTH(post_date)='$monthnum'";
-    }
-
-    if ('' != $day) {
-        $day = '' . intval($day);
-        $where .= " AND DAYOFMONTH(post_date)='$day'";
-    }
-
-    if ('' != $name) {
-        $name = preg_replace('/[^a-z0-9-_]/', '', $name);
-        $where .= " AND post_name = '$name'";
-    }
-
-    if ('' != $w) {
-        $w = ''.intval($w);
-        $where .= " AND WEEK(post_date, 1)='$w'";
-    }
-
-    // If a post number is specified, load that post
-    if (($p != '') && ($p != 'all')) {
-        $p = intval($p);
-        $where = ' AND ID = '.$p;
-    }
-
-    // If a search pattern is specified, load the posts that match
-    if (!empty($s)) {
-        $s = addslashes_gpc($s);
-        $search = ' AND (';
-        $s = preg_replace('/, +/', ' ', $s);
-        $s = str_replace(',', ' ', $s);
-        $s = str_replace('"', ' ', $s);
-        $s = trim($s);
-        if ($exact) {
-            $n = '';
-        } else {
-            $n = '%';
-        }
-        if (!$sentence) {
-            $s_array = explode(' ',$s);
-            $search .= '((post_title LIKE \''.$n.$s_array[0].$n.'\') OR (post_content LIKE \''.$n.$s_array[0].$n.'\'))';
-            for ( $i = 1; $i < count($s_array); $i = $i + 1) {
-                $search .= ' AND ((post_title LIKE \''.$n.$s_array[$i].$n.'\') OR (post_content LIKE \''.$n.$s_array[$i].$n.'\'))';
-            }
-            $search .= ' OR (post_title LIKE \''.$n.$s.$n.'\') OR (post_content LIKE \''.$n.$s.$n.'\')';
-            $search .= ')';
-        } else {
-            $search = ' AND ((post_title LIKE \''.$n.$s.$n.'\') OR (post_content LIKE \''.$n.$s.$n.'\'))';
-        }
-    }
-
-    // Category stuff
-
-    if ((empty($cat)) || ($cat == 'all') || ($cat == '0') || 
-        // Bypass cat checks if fetching specific posts
-        (
-         intval($year) || intval($monthnum) || intval($day) || intval($w) ||
-         intval($p) || !empty($name) || !empty($s)
-         )
-        ) {
-        $whichcat='';
-    } else {
-        $cat = ''.urldecode($cat).'';
-        $cat = addslashes_gpc($cat);
-        if (stristr($cat,'-')) {
-            // Note: if we have a negative, we ignore all the positives. It must
-            // always mean 'everything /except/ this one'. We should be able to do
-            // multiple negatives but we don't :-(
-            $eq = '!=';
-            $andor = 'AND';
-            $cat = explode('-',$cat);
-            $cat = intval($cat[1]);
-        } else {
-            $eq = '=';
-            $andor = 'OR';
-        }
-        $join = " LEFT JOIN $wpdb->post2cat ON ($wpdb->posts.ID = $wpdb->post2cat.post_id) ";
-        $cat_array = explode(' ',$cat);
-        $whichcat .= ' AND (category_id '.$eq.' '.intval($cat_array[0]);
-        $whichcat .= get_category_children($cat_array[0], ' '.$andor.' category_id '.$eq.' ');
-        for ($i = 1; $i < (count($cat_array)); $i = $i + 1) {
-            $whichcat .= ' '.$andor.' category_id '.$eq.' '.intval($cat_array[$i]);
-            $whichcat .= get_category_children($cat_array[$i], ' '.$andor.' category_id '.$eq.' ');
-        }
-        $whichcat .= ')';
-        if ($eq == '!=') {
-            $cat = '-'.$cat; // Put back the knowledge that we are excluding a category.
-        }
-    }
-
-    // Category stuff for nice URIs
-
-    if ('' != $category_name) {
-        if (stristr($category_name,'/')) {
-            $category_name = explode('/',$category_name);
-            if ($category_name[count($category_name)-1]) {
-                $category_name = $category_name[count($category_name)-1]; // no trailing slash
-            } else {
-                $category_name = $category_name[count($category_name)-2]; // there was a trailling slash
-            }
-        }
-        $category_name = preg_replace('|[^a-z0-9-_]|i', '', $category_name);
-        $tables = ", $wpdb->post2cat, $wpdb->categories";
-        $join = " LEFT JOIN $wpdb->post2cat ON ($wpdb->posts.ID = $wpdb->post2cat.post_id) LEFT JOIN $wpdb->categories ON ($wpdb->post2cat.category_id = $wpdb->categories.cat_ID) ";
-        $whichcat = " AND (category_nicename = '$category_name'";
-        $cat = $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE category_nicename = '$category_name'");
-        $whichcat .= get_category_children($cat, " OR category_id = ");
-        $whichcat .= ")";
-    }
-
-    // Author/user stuff
-
-    if ((empty($author)) || ($author == 'all') || ($author == '0')) {
-        $whichauthor='';
-    } else {
-        $author = ''.urldecode($author).'';
-        $author = addslashes_gpc($author);
-        if (stristr($author, '-')) {
-            $eq = '!=';
-            $andor = 'AND';
-            $author = explode('-', $author);
-            $author = ''.intval($author[1]);
-        } else {
-            $eq = '=';
-            $andor = 'OR';
-        }
-        $author_array = explode(' ', $author);
-        $whichauthor .= ' AND (post_author '.$eq.' '.intval($author_array[0]);
-        for ($i = 1; $i < (count($author_array)); $i = $i + 1) {
-            $whichauthor .= ' '.$andor.' post_author '.$eq.' '.intval($author_array[$i]);
-        }
-        $whichauthor .= ')';
-    }
-
-    // Author stuff for nice URIs
-
-    if ('' != $author_name) {
-        if (stristr($author_name,'/')) {
-            $author_name = explode('/',$author_name);
-            if ($author_name[count($author_name)-1]) {
-                $author_name = $author_name[count($author_name)-1];#no trailing slash
-            } else {
-                $author_name = $author_name[count($author_name)-2];#there was a trailling slash
-            }
-        }
-        $author_name = preg_replace('|[^a-z0-9-_]|', '', strtolower($author_name));
-        $author = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_nicename='".$author_name."'");
-        $whichauthor .= ' AND (post_author = '.intval($author).')';
-    }
-
-    $where .= $search.$whichcat.$whichauthor;
-
-    if ((empty($order)) || ((strtoupper($order) != 'ASC') && (strtoupper($order) != 'DESC'))) {
-        $order='DESC';
-    }
-
-    // Order by
-    if (empty($orderby)) {
-        $orderby='date '.$order;
-    } else {
-        // Used to filter values
-        $allowed_keys = array('author','date','category','title');
-        $orderby = urldecode($orderby);
-        $orderby = addslashes_gpc($orderby);
-        $orderby_array = explode(' ',$orderby);
-        if (!in_array($orderby_array[0],$allowed_keys)) {
-            $orderby_array[0] = 'date';
-        }
-        $orderby = $orderby_array[0].' '.$order;
-        if (count($orderby_array)>1) {
-            for ($i = 1; $i < (count($orderby_array)); $i = $i + 1) {
-                // Only allow certain values for safety
-                if (in_array($orderby_array[$i],$allowed_keys)) {
-                    $orderby .= ',post_'.$orderby_array[$i].' '.$order;
-                }
-            }
-        }
-    }
-
-    if ((!$whichcat) && (!$m) && (!$p) && (!$w) && (!$s) && empty($poststart) && empty($postend)) {
-        if ($what_to_show == 'posts') {
-            $limits = ' LIMIT '.$posts_per_page;
-        } elseif ($what_to_show == 'days' && empty($monthnum) && empty($year) && empty($day)) {
-            $lastpostdate = get_lastpostdate();
-            $lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate);
-            $lastpostdate = mysql2date('U',$lastpostdate);
-            $otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($posts_per_page-1) * 86400)));
-            $where .= " AND post_date > '$otherdate'";
-        }
-    }
-
-    if ( !empty($postend) && ($postend > $poststart) && (!$m) && empty($monthnum) && empty($year) && empty($day) &&(!$w) && (!$whichcat) && (!$s) && (!$p)) {
-        if ($what_to_show == 'posts') {
-            $poststart = intval($poststart);
-            $postend = intval($postend);
-            $limposts = $postend - $poststart;
-            $limits = ' LIMIT '.$poststart.','.$limposts;
-        } elseif ($what_to_show == 'days') {
-            $poststart = intval($poststart);
-            $postend = intval($postend);
-            $limposts = $postend - $poststart;
-            $lastpostdate = get_lastpostdate();
-            $lastpostdate = mysql2date('Y-m-d 00:00:00',$lastpostdate);
-            $lastpostdate = mysql2date('U',$lastpostdate);
-            $startdate = date('Y-m-d H:i:s', ($lastpostdate - (($poststart -1) * 86400)));
-            $otherdate = date('Y-m-d H:i:s', ($lastpostdate - (($postend -1) * 86400)));
-            $where .= " AND post_date > '$otherdate' AND post_date < '$startdate'";
-        }
-    } else {
-        if (($what_to_show == 'posts') && (! is_single()) && (!$more)) {
-            if ($pagenow != 'post.php') {
-                $pgstrt = '';
-                if ($paged) {
-                    $pgstrt = (intval($paged) -1) * $posts_per_page . ', ';
-                }
-                $limits = 'LIMIT '.$pgstrt.$posts_per_page;
-            } else {
-                if (($m) || ($p) || ($w) || ($s) || ($whichcat)) {
-                    $limits = '';
-                } else {
-                    $pgstrt = '';
-                    if ($paged) {
-                        $pgstrt = (intval($paged) -1) * $posts_per_page . ', ';
-                    }
-                    $limits = 'LIMIT '.$pgstrt.$posts_per_page;
-                }
-            }
-        }
-        elseif (($m) || ($p) || ($w) || ($s) || ($whichcat) || ($author) || $monthnum || $year || $day) {
-            $limits = '';
-        }
-    }
-
-    if ($p == 'all') {
-        $where = '';
-    }
-
-    $now = gmdate('Y-m-d H:i:59');
-
-    if ($pagenow != 'post.php' && $pagenow != 'edit.php') {
-        if ((empty($poststart)) || (empty($postend)) || !($postend > $poststart)) {
-            $where .= " AND post_date_gmt <= '$now'";
-        }
-
-        $distinct = 'DISTINCT';
-    }
-    $where .= ' AND (post_status = "publish"';
-
-    // Get private posts
-    if (isset($user_ID) && ('' != intval($user_ID)))
-        $where .= " OR post_author = $user_ID AND post_status != 'draft')";
-    else
-        $where .= ')';
-
-    $where = apply_filters('posts_where', $where);
-    $where .= " GROUP BY $wpdb->posts.ID";
-    $request = " SELECT $distinct * FROM $wpdb->posts $join WHERE 1=1".$where." ORDER BY post_$orderby $limits";
-
-
-    if ($preview) {
-        $request = 'SELECT 1-1'; // dummy mysql query for the preview
-        // little funky fix for IEwin, rawk on that code
-        $is_winIE = ((preg_match('/MSIE/',$HTTP_USER_AGENT)) && (preg_match('/Win/',$HTTP_USER_AGENT)));
-        if (($is_winIE) && (!isset($IEWin_bookmarklet_fix))) {
-            $preview_content =  preg_replace('/\%u([0-9A-F]{4,4})/e',  "'&#'.base_convert('\\1',16,10).';'", $preview_content);
-        }
-    }
-
-    // error_log("$request");
-    // echo $request;
-    $posts = $wpdb->get_results($request);
-    $posts = apply_filters('the_posts', $posts);
-
-    update_post_caches($posts);
-    return $posts;
+    global $wp_query;
+
+    return $wp_query->query($query);
 }
 
@@ -1853 +1534 @@
 
 function is_single () {
-    global $wp_query_state;
-
-    return $wp_query_state->single;
+    global $wp_query;
+
+    return $wp_query->is_single;
 }
 
 function is_archive () {
-    global $wp_query_state;
-
-    return $wp_query_state->archive;
+    global $wp_query;
+
+    return $wp_query->is_archive;
 }
 
 function is_date () {
-    global $wp_query_state;
-
-    return $wp_query_state->date;
+    global $wp_query;
+
+    return $wp_query->is_date;
 }
 
 function is_author () {
-    global $wp_query_state;
-
-    return $wp_query_state->author;
+    global $wp_query;
+
+    return $wp_query->is_author;
 }
 
 function is_category () {
-    global $wp_query_state;
-
-    return $wp_query_state->category;
+    global $wp_query;
+
+    return $wp_query->is_category;
 }
 
 function is_search () {
-    global $wp_query_state;
-
-    return $wp_query_state->search;
+    global $wp_query;
+
+    return $wp_query->is_search;
 }
 
 function is_feed () {
-    global $wp_query_state;
-
-    return $wp_query_state->search;
+    global $wp_query;
+
+    return $wp_query->is_feed;
 }
 
 function is_home () {
-    global $wp_query_state;
-
-    return $wp_query_state->home;
+    global $wp_query;
+
+    return $wp_query->is_home;
+}
+
+function have_posts() {
+    global $wp_query;
+
+    return $wp_query->have_posts();
+}
+
+function the_post() {
+    start_wp(true);
 }