Changeset 6443

Timestamp:

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

Author:

ryan

Message:

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

Location:

branches/2.3/wp-includes

Files:

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

branches/2.3/wp-includes/functions.php

@@ -199 +199 @@
                 if ( false === $value ) {
                         if ( defined('WP_INSTALLING') )
-                                $wpdb->hide_errors();
+                                $show = $wpdb->hide_errors();
                         $row = $wpdb->get_row("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting' LIMIT 1");
                         if ( defined('WP_INSTALLING') )
-                                $wpdb->show_errors();
+                                $wpdb->show_errors($show);
 
                         if( is_object( $row) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values
@@ -237 +237 @@
 function get_alloptions() {
         global $wpdb, $wp_queries;
-        $wpdb->hide_errors();
+        $show = $wpdb->hide_errors();
         if ( !$options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'") ) {
                 $options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options");
         }
-        $wpdb->show_errors();
+        $wpdb->show_errors($show);
 
         foreach ($options as $option) {
@@ -264 +264 @@
 
         if ( !$alloptions ) {
-                $wpdb->hide_errors();
+                $show = $wpdb->hide_errors();
                 if ( !$alloptions_db = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'") )
                         $alloptions_db = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options");
-                $wpdb->show_errors();
+                $wpdb->show_errors($show);
                 $alloptions = array();
                 foreach ( (array) $alloptions_db as $o )
@@ -893 +893 @@
 function is_blog_installed() {
         global $wpdb;
-        $wpdb->hide_errors();
+        $show = $wpdb->hide_errors();
         $installed = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'");
-        $wpdb->show_errors();
+        $wpdb->show_errors($show);
 
         $install_status = !empty( $installed ) ? TRUE : FALSE;

branches/2.3/wp-includes/pluggable.php

@@ -73 +73 @@
                 return false;
 
-        $wpdb->hide_errors();
+        $show = $wpdb->hide_errors();
         $metavalues = $wpdb->get_results("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = '$user_id'");
-        $wpdb->show_errors();
+        $wpdb->show_errors($show);
 
         if ($metavalues) {

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;
         }