Changeset 7431

Timestamp:

03/20/2008 11:34:32 PM (17 years ago)

Author:

ryan

Message:

Capture last db error. Pass it in WP_Error data when term inserts fail. Fix typo in WP_Ajax_Response

Location:

trunk/wp-includes

Files:

• classes.php (modified) (1 diff)
• taxonomy.php (modified) (2 diffs)
• wp-db.php (modified) (2 diffs)

trunk/wp-includes/classes.php

@@ -765 +765 @@
 
                 if ( is_scalar($error_data) ) {
-                    $response .= "<![CDATA[$v]]>";
+                    $response .= "<![CDATA[$error_data]]>";
                 } elseif ( is_array($error_data) ) {
                     foreach ( $error_data as $k => $v )

trunk/wp-includes/taxonomy.php

@@ -1154 +1154 @@
     if ( ! $term_id = is_term($slug) ) {
         if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
-            return new WP_Error('db_insert_error', __('Could not insert term into the database'));
+            return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
         $term_id = (int) $wpdb->insert_id;
     } else if ( is_taxonomy_hierarchical($taxonomy) && !empty($parent) ) {
@@ -1161 +1161 @@
         $slug = wp_unique_term_slug($slug, (object) $args);
         if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
-            return new WP_Error('db_insert_error', __('Could not insert term into the database'));
+            return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
         $term_id = (int) $wpdb->insert_id;
     }

trunk/wp-includes/wp-db.php

@@ -19 +19 @@
     var $show_errors = false;
     var $suppress_errors = false;
+    var $last_error = '';
     var $num_queries = 0;
     var $last_query;
@@ -279 +280 @@
 
         // If there is an error then take note of it..
-        if ( mysql_error($this->dbh) ) {
+        if ( $this->last_error = mysql_error($this->dbh) ) {
             $this->print_error();
             return false;