Changeset 6391 for trunk/wp-includes/functions.php

Timestamp:

12/16/2007 09:38:24 PM (17 years ago)

Author:

ryan

Message:

Suppress display of DB error messages by default. Props filosofo. see #5473

File:

• trunk/wp-includes/functions.php (modified) (4 diffs)

trunk/wp-includes/functions.php

@@ -207 +207 @@
         if ( false === $value ) {
             if ( defined( 'WP_INSTALLING' ) )
-                $wpdb->hide_errors();
+                $show = $wpdb->hide_errors();
             // expected_slashed ($setting)
             $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
@@ -247 +247 @@
 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 ) {
@@ -270 +270 @@
 
     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 )
@@ -950 +950 @@
         return true;
 
-    $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);
 
     $installed = !empty( $installed ) ? true : false;