Changeset 6376

Timestamp:

12/12/07 05:14:00 (10 months ago)

Author:

ryan

Message:

Defer term counting during import. Props tellyworth. fixes #5377

Files:

• trunk/wp-admin/import/wordpress.php (modified) (2 diffs)
• trunk/wp-includes/taxonomy.php (modified) (3 diffs)

trunk/wp-admin/import/wordpress.php

@@ -447 +447 @@
-        
-        $this->get_authors_from_post();
+        wp_defer_term_counting(true);
-        $this->get_entries();
-        $this->process_categories();
@@ -452 +453 @@
-        $result = $this->process_posts();
-        $this->backfill_parents();
+        wp_defer_term_counting(false);
-        if ( is_wp_error( $result ) )
-            return $result;

trunk/wp-includes/taxonomy.php

@@ -1318 +1318 @@
-}
-
+// enable or disable term count deferring
+// if no value is supplied, the current value of the defer setting is returned
+function wp_defer_term_counting($defer=NULL) {
+    static $_defer = false;
+    
+    if ( is_bool($defer) ) {
+        $_defer = $defer;
+        // flush any deferred counts
+        if ( !$defer )
+            wp_update_term_count( NULL, NULL, true );
+    }
+    
+    return $_defer;
+}
+
-/**
- * wp_update_term_count() - Updates the amount of terms in taxonomy
@@ -1335 +1350 @@
- * @return bool If no terms will return false, and if successful will return true.
- */
-
-
+
+
+
+
+
+
+
+
+
-
-    if ( empty($terms) )
@@ -1343 +1365 @@
-    if ( !is_array($terms) )
-        $terms = array($terms);
+
+    if ( wp_defer_term_counting() ) {
+        if ( !isset($_deferred[$taxonomy]) )
+            $_deferred[$taxonomy] = array();
+        $_deferred[$taxonomy] = array_unique( array_merge($_deferred[$taxonomy], $terms) );
+        return true;
+    }
+    
+    return wp_update_term_count_now( $terms, $taxonomy );
+}
+
+function wp_update_term_count_now( $terms, $taxonomy ) {
+    global $wpdb;
-
-    $terms = array_map('intval', $terms);