Changeset 6443 for branches/2.3/wp-includes/wp-db.php

Timestamp:

12/21/2007 01:31:31 AM (18 years ago)

Author:

ryan

Message:

Suppress display of DB error messages by default. Props filosofo. fixes #5473 for 2.3

File:

• branches/2.3/wp-includes/wp-db.php (modified) (3 diffs)

branches/2.3/wp-includes/wp-db.php

@@ -16 +16 @@
 class wpdb {
 
-    var $show_errors = true;
+    var $show_errors = false;
     var $num_queries = 0;
     var $last_query;
@@ -150 +150 @@
         array ('query' => $this->last_query, 'error_str' => $str);
 
+        $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);
+
+        // Is error output turned on or not..
+        if ( !$this->show_errors )
+            return false;
+
         $str = htmlspecialchars($str, ENT_QUOTES);
         $query = htmlspecialchars($this->last_query, ENT_QUOTES);
-        // Is error output turned on or not..
-        if ( $this->show_errors ) {
-            // If there is an error then take note of it
-            print "<div id='error'>
-            <p class='wpdberror'><strong>WordPress database error:</strong> [$str]<br />
-            <code>$query</code></p>
-            </div>";
-        } else {
-            return false;
-        }
+
+        // If there is an error then take note of it
+        print "<div id='error'>
+        <p class='wpdberror'><strong>WordPress database error:</strong> [$str]<br />
+        <code>$query</code></p>
+        </div>";
     }
 
@@ -167 +172 @@
     //  Turn error handling on or off..
 
-    function show_errors() {
-        $this->show_errors = true;
+    function show_errors( $show = true ) {
+        $errors = $this->show_errors;
+        $this->show_errors = $show;
+        return $errors;
     }
 
     function hide_errors() {
+        $show = $this->show_errors;
         $this->show_errors = false;
+        return $show;
     }