Ticket #22435: export.2.diff

wp-includes/export/class-wp-export-query.php

@@ -27 +27 @@
         private $author;
         private $category;
 
+        public $missing_parents = false;
+
         public function __construct( $filters = array() ) {
                 $this->filters = wp_parse_args( $filters, self::$defaults );
                 $this->post_ids = $this->calculate_post_ids();
@@ -76 +78 @@
                         return array();
                 }
                 $categories = (array) get_categories( array( 'get' => 'all' ) );
+
+                $this->check_for_orphaned_terms( $categories );
+
                 $categories = self::topologically_sort_terms( $categories );
+
                 return $categories;
         }
 
@@ -85 +91 @@
                         return array();
                 }
                 $tags = (array) get_tags( array( 'get' => 'all' ) );
+
+                $this->check_for_orphaned_terms( $tags );
+
                 return $tags;
         }
 
@@ -94 +103 @@
                 }
                 $custom_taxonomies = get_taxonomies( array( '_builtin' => false ) );
                 $custom_terms = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) );
+                $this->check_for_orphaned_terms( $custom_terms );
                 $custom_terms = self::topologically_sort_terms( $custom_terms );
                 return $custom_terms;
         }
@@ -271 +281 @@
                 return $sorted;
         }
 
+        private function check_for_orphaned_terms( $terms ) {
+                $term_ids = array();
+                $have_parent = array();
+
+                foreach ( $terms as $term ) {
+                        $term_ids[ $term->term_id ] = true;
+                        if ( $term->parent != 0 )
+                                $have_parent[] = $term;
+                }
+
+                foreach ( $have_parent as $has_parent ) {
+                        if ( ! isset( $term_ids[ $has_parent->parent ] ) ) {
+                                $this->missing_parents = $has_parent;
+                                throw new WP_Export_Term_Exception( __( 'Term is missing a parent.' ) );
+                        }
+                }
+        }
+
         private static function get_terms_for_post( $post ) {
                 $taxonomies = get_object_taxonomies( $post->post_type );
                 if ( empty( $taxonomies ) )
@@ -309 +337 @@
 
 class WP_Export_Exception extends RuntimeException {
 }
+
+class WP_Export_Term_Exception extends RuntimeException {
+}

wp-includes/export/functions.export.php

@@ -27 +27 @@
                 }
         }
         return $args;
-}
+}
+ No newline at end of file

wp-includes/export/writers.php

@@ -26 +26 @@
         }
 
         public function export() {
+                try {
+                        $export = $this->get_export();
+                        $this->send_headers();
+                        echo $export;
+                } catch ( WP_Export_Exception $e ) {
+                        $message = apply_filters( 'export_error_message', $e->getMessage() );
+                        wp_die( $message, __( 'Export Error' ), array( 'back_link' => true ) );
+                } catch ( WP_Export_Term_Exception $e ) {
+                        do_action( 'export_term_orphaned', $this->formatter->export->missing_parents );
+                        $message = apply_filters( 'export_term_error_message', $e->getMessage() );
+                        wp_die( $message, __( 'Export Error' ), array( 'back_link' => true ) );
+                }
+        }
+
+        protected function write( $xml ) {
+                $this->result .= $xml;
+        }
+
+        protected function get_export() {
+                $this->result = '';
+                parent::export();
+                return $this->result;
+        }
+
+        protected function send_headers() {
                 header( 'Content-Description: File Transfer' );
                 header( 'Content-Disposition: attachment; filename=' . $this->file_name );
                 header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
-                parent::export();
         }
-
-        protected function write( $xml ) {
-                echo $xml;
-        }
 }
 
 class WP_Export_Returner extends WP_Export_Base_Writer {
@@ -42 +62 @@
 
         public function export() {
                 $this->private = '';
-                parent::export();
+                try { 
+                        parent::export();
+                } catch ( WP_Export_Exception $e ) {
+                        $message = apply_filters( 'export_error_message', $e->getMessage() );
+                        return new WP_Error( 'wp-export-error', $message );
+                        
+                } catch ( WP_Export_Term_Exception $e ) {
+                        do_action( 'export_term_orphaned', $this->formatter->export->missing_parents );
+                        $message = apply_filters( 'export_term_error_message', $e->getMessage() );
+                        return new WP_Error( 'wp-export-error', $message );
+                }
                 return $this->result;
         }
         protected function write( $xml ) {
@@ -64 +94 @@
                 if ( !$this->f ) {
                         throw new WP_Export_Exception( sprintf( __( 'WP Export: error opening %s for writing.' ), $this->file_name ) );
                 }
-                parent::export();
+
+                try { 
+                        parent::export();
+                } catch ( WP_Export_Exception $e ) {
+                        throw $e;
+                } catch ( WP_Export_Term_Exception $e ) {
+                        throw $e;
+                }
+
                 fclose( $this->f );
         }