Changeset 7405

Timestamp:

03/19/2008 11:17:23 PM (19 years ago)

Author:

ryan

Message:

Suppress errors during option retrieval while installing. see #5771

File:

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

trunk/wp-includes/functions.php

@@ -217 +217 @@
                 if ( false === $value ) {
                         if ( defined( 'WP_INSTALLING' ) )
-                                $show = $wpdb->hide_errors();
+                                $supress = $wpdb->suppress_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($show);
+                                $wpdb->suppress_errors($suppress);
 
                         if ( is_object( $row) ) { // Has to be get_row instead of get_var because of funkiness with 0, false, null values
@@ -280 +280 @@
 
         if ( !$alloptions ) {
-                $show = $wpdb->hide_errors();
+                $suppress = $wpdb->suppress_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($show);
+                $wpdb->suppress_errors($suppress);
                 $alloptions = array();
                 foreach ( (array) $alloptions_db as $o )