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

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

File:

• branches/2.3/wp-includes/functions.php (modified) (4 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;