Changeset 558 for trunk/b2-include/b2template.functions.php

Timestamp:

11/25/2003 12:46:52 AM (22 years ago)

Author:

mikelittle

Message:

Missing querycount

File:

• trunk/b2-include/b2template.functions.php (modified) (12 diffs)

trunk/b2-include/b2template.functions.php

@@ -233 +233 @@
 
 function get_calendar($daylength = 1) {
-    global $wpdb, $HTTP_GET_VARS, $m, $monthnum, $year, $timedifference, $month, $weekday, $tableposts, $posts;
+    global $wpdb, $HTTP_GET_VARS, $m, $monthnum, $year, $timedifference, $month, $weekday, $tableposts, $posts, $querycount;
 
     // Quick check. If we have no posts at all, abort!
     if (!$posts) {
         $gotsome = $wpdb->get_var("SELECT ID from $tableposts WHERE post_status = 'publish' AND post_category > 0 ORDER BY post_date DESC LIMIT 1");
+        ++$querycount;
         if (!$gotsome)
             return;
@@ -254 +255 @@
         $d = (($w - 1) * 7) + 6; //it seems MySQL's weeks disagree with PHP's
         $thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('${thisyear}0101', INTERVAL $d DAY) ), '%m')");
+        ++$querycount;
     } elseif (!empty($m)) {
         $calendar = substr($m, 0, 6);
@@ -276 +278 @@
                               ORDER BY post_date DESC
                               LIMIT 1");
+    ++$querycount;
     $next = $wpdb->get_row("SELECT  DISTINCT MONTH( post_date ) AS month, YEAR( post_date ) AS year
             FROM $tableposts
@@ -283 +286 @@
                               ORDER  BY post_date ASC
                               LIMIT 1");
+    ++$querycount;
 
     echo '<table id="wp-calendar">
@@ -330 +334 @@
             AND post_status = 'publish'
             AND post_date < '" . date("Y-m-d H:i:s", (time() + ($time_difference * 3600)))."'", ARRAY_N);
-
+    ++$querycount;
     if ($dayswithposts) {
         foreach ($dayswithposts as $daywith) {
@@ -356 +360 @@
                                          ."AND post_status = 'publish'"
                                         );
+    ++$querycount;
     if ($ak_post_titles) {
         foreach ($ak_post_titles as $ak_post_title) {
@@ -406 +411 @@
 function get_permalink($id=false) {
     global $post, $wpdb, $tableposts;
-    global $siteurl, $blogfilename, $querystring_start, $querystring_equal;
+    global $siteurl, $blogfilename, $querystring_start, $querystring_equal, $querycount;
+
     $rewritecode = array(
         '%year%',
@@ -428 +434 @@
     } else { // if an ID is given
         $idpost = $wpdb->get_row("SELECT post_date, post_name FROM $tableposts WHERE ID = $id");
+        ++$querycount;
         if ('' != get_settings('permalink_structure')) {
             $unixtime = strtotime($idpost->post_date);
@@ -1351 +1358 @@
 
     $categories = $wpdb->get_results($query);
-
+    ++$querycount;
     if (!$categories) {
         if ($list) {
@@ -1360 +1367 @@
         return;
     }
-    ++$querycount;
     if (intval($optionall) == 1) {
         $all = apply_filters('list_cats', $all);
@@ -1406 +1412 @@
 function comments_number($zero='No Comments', $one='1 Comment', $more='% Comments', $include_unapproved = false) {
     global $id, $comment, $tablecomments, $querycount, $wpdb;
-    $query = "SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = '$id'";
+    $query = "SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id";
     if (false == $include_unapproved) {
         $query .= " AND comment_approved = '1'";
     }
     $number = $wpdb->get_var($query);
+    ++$querycount;
     if ($number == 0) {
         $blah = $zero;
@@ -1439 +1446 @@
 
 function comments_popup_link($zero='No Comments', $one='1 Comment', $more='% Comments', $CSSclass='', $none='Comments Off') {
-    global $id, $b2commentspopupfile, $b2commentsjavascript, $post, $wpdb, $tablecomments, $HTTP_COOKIE_VARS, $cookiehash;
+    global $id, $b2commentspopupfile, $b2commentsjavascript, $post, $wpdb, $querycount, $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'");
+    ++$querycount;
     if (0 == $number && 'closed' == $post->comment_status) {
         echo $none;