diff --git a/wp-includes/template-functions.php b/wp-includes/template-functions.php
index 8ece23dd4..b1f5a1ea3 100644
--- a/wp-includes/template-functions.php
+++ b/wp-includes/template-functions.php
@@ -1556,13 +1556,9 @@ function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_orde
 
 // generic comments/trackbacks/pingbacks numbering
 
-function comments_number($zero='No Comments', $one='1 Comment', $more='% Comments', $include_unapproved = false) {
+function comments_number($zero='No Comments', $one='1 Comment', $more='% Comments', $number) {
 	global $id, $comment, $tablecomments, $wpdb;
-	$query = "SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id";
-	if (false == $include_unapproved) {
-	    $query .= " AND comment_approved = '1'";
-	}
-	$number = $wpdb->get_var($query);
+	if ('' == $number) $number = $wpdb->get_var("SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id AND comment_approved = '1'");
 	if ($number == 0) {
 		$blah = $zero;
 	} elseif ($number == 1) {
@@ -1593,7 +1589,7 @@ function comments_popup_script($width=400, $height=400, $file='wp-comments-popup
 function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') {
 	global $id, $wpcommentspopupfile, $wpcommentsjavascript, $post, $wpdb, $tablecomments, $HTTP_COOKIE_VARS, $cookiehash;
 	global $querystring_start, $querystring_equal, $querystring_separator, $siteurl;
-	$number = $wpdb->get_var("SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id AND comment_approved = '1'");
+	$number = $wpdb->get_var("SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id AND comment_approved = '1';");
 	if (0 == $number && 'closed' == $post->comment_status && 'closed' == $post->ping_status) {
 		echo $none;
 		return;
@@ -1618,7 +1614,7 @@ function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Com
             echo ' class="'.$CSSclass.'"';
         }
         echo '>';
-        comments_number($zero, $one, $more);
+        comments_number($zero, $one, $more, $number);
         echo '</a>';
     }
 }
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index 9683308ee..d965a66f7 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -12,6 +12,7 @@
 	define('OBJECT', 'OBJECT', true);
 	define('ARRAY_A', 'ARRAY_A', true);
 	define('ARRAY_N', 'ARRAY_N', true);
+	define('SAVEQUERIES', true);
 
 	//	The Main Class, renamed to avoid conflicts.
 
@@ -155,6 +156,9 @@
 			// Perform the query via std mysql_query function..
 			$this->result = mysql_query($query, $this->dbh);
 			++$this->querycount;
+			if (SAVEQUERIES) {
+				$this->savedqueries[] = $query;
+			}
 
 			// If there was an insert, delete or update see how many rows were affected
 			// (Also, If there there was an insert take note of the insert_id