Changeset 570 for trunk/b2-include/b2functions.php

Timestamp:

12/05/2003 01:27:00 AM (23 years ago)

Author:

mikelittle

Message:

Removed $querycount.

File:

• trunk/b2-include/b2functions.php (modified) (20 diffs)

trunk/b2-include/b2functions.php

@@ -374 +374 @@
 
 function get_lastpostdate() {
-        global $tableposts, $cache_lastpostdate, $use_cache, $time_difference, $pagenow, $wpdb, $querycount;
+        global $tableposts, $cache_lastpostdate, $use_cache, $time_difference, $pagenow, $wpdb;
         if ((!isset($cache_lastpostdate)) OR (!$use_cache)) {
                 $now = date("Y-m-d H:i:s",(time() + ($time_difference * 3600)));
@@ -383 +383 @@
                 }
                 $lastpostdate = $wpdb->get_var("SELECT post_date FROM $tableposts WHERE $showcatzero post_date <= '$now' ORDER BY post_date DESC LIMIT 1");
-                ++$querycount;
                 $cache_lastpostdate = $lastpostdate;
 //              echo $lastpostdate;
@@ -416 +415 @@
 
 function get_userdata($userid) {
-        global $wpdb, $querycount, $cache_userdata, $use_cache, $tableusers;
+        global $wpdb, $cache_userdata, $use_cache, $tableusers;
         if ((empty($cache_userdata[$userid])) || (!$use_cache)) {
                 $user = $wpdb->get_row("SELECT * FROM $tableusers WHERE ID = $userid");
@@ -424 +423 @@
         $user->user_firstname =  stripslashes($user->user_firstname);
         $user->user_lastname = stripslashes($user->user_lastname);
-        ++$querycount;
                 $cache_userdata[$userid] = $user;
         } else {
@@ -446 +444 @@
 
 function get_userdatabylogin($user_login) {
-        global $tableusers, $querycount, $cache_userdata, $use_cache, $wpdb;
+        global $tableusers, $cache_userdata, $use_cache, $wpdb;
         if ((empty($cache_userdata["$user_login"])) OR (!$use_cache)) {
                 $user = $wpdb->get_row("SELECT * FROM $tableusers WHERE user_login = '$user_login'");
-                ++$querycount;
                 $cache_userdata["$user_login"] = $user;
         } else {
@@ -458 +455 @@
 
 function get_userid($user_login) {
-        global $tableusers, $querycount, $cache_userdata, $use_cache, $wpdb;
+        global $tableusers, $cache_userdata, $use_cache, $wpdb;
         if ((empty($cache_userdata["$user_login"])) OR (!$use_cache)) {
                 $user_id = $wpdb->get_var("SELECT ID FROM $tableusers WHERE user_login = '$user_login'");
 
-                ++$querycount;
                 $cache_userdata["$user_login"] = $user_id;
         } else {
@@ -471 +467 @@
 
 function get_usernumposts($userid) {
-        global $tableposts, $tablecomments, $querycount, $wpdb;
-        ++$querycount;
+        global $tableposts, $tablecomments, $wpdb;
         return $wpdb->get_var("SELECT COUNT(*) FROM $tableposts WHERE post_author = $userid");
 }
@@ -479 +474 @@
 // determine the post ID it represents.
 function url_to_postid($url = '') {
-        global $wpdb, $querycount, $tableposts, $siteurl;
+        global $wpdb, $tableposts, $siteurl;
 
         // Take a link like 'http://example.com/blog/something'
@@ -537 +532 @@
 
         // Run the query to get the post ID:
-    ++$querycount;
     return intval($wpdb->get_var("SELECT ID FROM $tableposts WHERE 1 = 1 " . $where));
 }
@@ -545 +539 @@
 
 function get_settings($setting) {
-        global $wpdb, $cache_settings, $use_cache, $querycount;
+        global $wpdb, $cache_settings, $use_cache;
         if ((empty($cache_settings)) OR (!$use_cache)) {
                 $settings = get_alloptions();
@@ -559 +553 @@
 
 function get_alloptions() {
-    global $tableoptions, $wpdb, $querycount;
+    global $tableoptions, $wpdb;
     $options = $wpdb->get_results("SELECT option_name, option_value FROM $tableoptions");
-    ++$querycount;
     if ($options) {
         foreach ($options as $option) {
@@ -583 +576 @@
 
 function get_postdata($postid) {
-        global $tableusers, $tablecategories, $tableposts, $tablecomments, $querycount, $wpdb;
+        global $tableusers, $tablecategories, $tableposts, $tablecomments, $wpdb;
         $post = $wpdb->get_row("SELECT * FROM $tableposts WHERE ID = $postid");
-        ++$querycount;
         
         $postdata = array (
@@ -626 +618 @@
 
 function get_commentdata($comment_ID,$no_cache=0,$include_unapproved=false) { // less flexible, but saves DB queries
-        global $postc,$id,$commentdata,$tablecomments,$querycount, $wpdb;
+        global $postc,$id,$commentdata,$tablecomments, $wpdb;
         if ($no_cache) {
                 $query = "SELECT * FROM $tablecomments WHERE comment_ID = $comment_ID";
@@ -633 +625 @@
                 }
                 $myrow = $wpdb->get_row($query, ARRAY_A);
-                ++$querycount;
         } else {
                 $myrow['comment_ID']=$postc->comment_ID;
@@ -656 +647 @@
 
 function get_catname($cat_ID) {
-        global $tablecategories,$cache_catnames,$use_cache,$querycount, $wpdb;
+        global $tablecategories,$cache_catnames,$use_cache, $wpdb;
         if ((!$cache_catnames) || (!$use_cache)) {
         $results = $wpdb->get_results("SELECT * FROM $tablecategories") or die('Oops, couldn\'t query the db for categories.');
-                $querycount++;
                 foreach ($results as $post) {
                         $cache_catnames[$post->cat_ID] = $post->cat_name;
@@ -674 +664 @@
 
 function dropdown_categories($blog_ID=1, $default=1) {
-        global $postdata,$tablecategories,$mode,$querycount, $wpdb;
+        global $postdata,$tablecategories,$mode, $wpdb;
         $query="SELECT * FROM $tablecategories ORDER BY cat_name";
         $results = $wpdb->get_results($query);
-        ++$querycount;
         $width = ($mode=="sidebar") ? "100%" : "170px";
         echo '<select name="post_category" style="width:'.$width.';" tabindex="2" id="category">';
@@ -683 +672 @@
         $default = $postdata["Category"];
     }
-        ++$querycount;
         foreach($results as $post) {
                 echo "<option value=\"".$post->cat_ID."\"";
@@ -1442 +1430 @@
  */
 function wp_get_comment_status($comment_id) {
-    global $wpdb, $querycount, $tablecomments;
+    global $wpdb, $tablecomments;
     
     $result = $wpdb->get_var("SELECT comment_approved FROM $tablecomments WHERE comment_ID='$comment_id' LIMIT 1");
-    ++$querycount;
     if ($result == NULL) {
         return "deleted";
@@ -1458 +1445 @@
 
 function wp_notify_postauthor($comment_id, $comment_type) {
-    global $wpdb, $querycount, $tablecomments, $tableposts, $tableusers;
+    global $wpdb, $tablecomments, $tableposts, $tableusers;
     global $querystring_start, $querystring_equal, $querystring_separator;
     global $blogfilename, $blogname, $siteurl;
     
     $comment = $wpdb->get_row("SELECT * FROM $tablecomments WHERE comment_ID='$comment_id' LIMIT 1");
-    ++$querycount;
     $post = $wpdb->get_row("SELECT * FROM $tableposts WHERE ID='$comment->comment_post_ID' LIMIT 1");
-    ++$querycount;
     $user = $wpdb->get_row("SELECT * FROM $tableusers WHERE ID='$post->post_author' LIMIT 1");
-    ++$querycount;
 
     if ('' == $user->user_email) return false; // If there's no email to send the comment to
@@ -1518 +1502 @@
  */
 function wp_notify_moderator($comment_id) {
-    global $wpdb, $querycount, $tablecomments, $tableposts, $tableusers;
+    global $wpdb, $tablecomments, $tableposts, $tableusers;
     global $querystring_start, $querystring_equal, $querystring_separator;
     global $blogfilename, $blogname, $siteurl;
     
     $comment = $wpdb->get_row("SELECT * FROM $tablecomments WHERE comment_ID='$comment_id' LIMIT 1");
-    ++$querycount;
     $post = $wpdb->get_row("SELECT * FROM $tableposts WHERE ID='$comment->comment_post_ID' LIMIT 1");
-    ++$querycount;
     $user = $wpdb->get_row("SELECT * FROM $tableusers WHERE ID='$post->post_author' LIMIT 1");
-    ++$querycount;
 
     $comment_author_domain = gethostbyaddr($comment->comment_author_IP);
     $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $tablecomments WHERE comment_approved = '0'");
-    ++$querycount;
 
     $notify_message  = "A new comment on the post #$comment->comment_post_ID \"".stripslashes($post->post_title)."\" is waiting for your approval\r\n\r\n";