Ticket #5473: suppress_db_errors.diff

wp-includes/wp-db.php

@@ -15 +15 @@
 
 class wpdb {
 
-        var $show_errors = true;
+        var $show_errors = false;
         var $num_queries = 0;
         var $last_query;
         var $col_info;

wp-includes/functions.php

@@ -249 +249 @@
         $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();
+        if ( defined('WP_DEBUG') and WP_DEBUG == true )
+                $wpdb->show_errors();
 
         foreach ( $options as $option ) {
                 // "When trying to design a foolproof system,
@@ -272 +273 @@
                 $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();
+                if ( defined('WP_DEBUG') and WP_DEBUG == true )
+                        $wpdb->show_errors();
                 $alloptions = array();
                 foreach ( (array) $alloptions_db as $o )
                         $alloptions[$o->option_name] = $o->option_value;
@@ -915 +917 @@
 
         $wpdb->hide_errors();
         $installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
-        $wpdb->show_errors();
+        if ( defined('WP_DEBUG') and WP_DEBUG == true )
+                $wpdb->show_errors();
 
         $installed = !empty( $installed ) ? true : false;
         wp_cache_set('is_blog_installed', $installed);

wp-includes/user.php

@@ -238 +238 @@
 
         $wpdb->hide_errors();
         $metavalues = $wpdb->get_results($wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user->ID));
-        $wpdb->show_errors();
+        if ( defined('WP_DEBUG') and WP_DEBUG == true )
+                $wpdb->show_errors();
 
         if ( $metavalues ) {
                 foreach ( $metavalues as $meta ) {