Changeset 7269

Timestamp:

03/12/2008 10:41:43 PM (17 years ago)

Author:

ryan

Message:

Suppress logging of DB errors when checking if blog is installed. see #5771

Location:

trunk/wp-includes

Files:

• functions.php (modified) (1 diff)
• wp-db.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -958 +958 @@
         return true;
 
-    $show = $wpdb->hide_errors();
+    $suppress = $wpdb->suppress_errors();
     $installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
-    $wpdb->show_errors($show);
+    $wpdb->suppress_errors($suppress);
 
     $installed = !empty( $installed ) ? true : false;

trunk/wp-includes/wp-db.php

@@ -18 +18 @@
 
     var $show_errors = false;
+    var $suppress_errors = false;
     var $num_queries = 0;
     var $last_query;
@@ -178 +179 @@
     function print_error($str = '') {
         global $EZSQL_ERROR;
+
         if (!$str) $str = mysql_error($this->dbh);
         $EZSQL_ERROR[] =
         array ('query' => $this->last_query, 'error_str' => $str);
 
+        if ( $this->suppress_errors )
+            return false;
+
         $error_str = "WordPress database error $str for query $this->last_query";
         if ( $caller = $this->get_caller() )
             $error_str .= " made by $caller";
+        
         @error_log($error_str, 0);
 
@@ -214 +220 @@
         $this->show_errors = false;
         return $show;
+    }
+
+    function suppress_errors( $suppress = true ) {
+        $errors = $this->suppress_errors;
+        $this->suppress_errors = $suppress;
+        return $errors;
     }