Ticket #15634: 15634.combined.diff

trunk/parsers.php

@@ -200 +200 @@
                         'categories' => $categories,
                         'tags' => $tags,
                         'terms' => $terms,
-                        'base_url' => $base_url
+                        'base_url' => $base_url,
+                        'version' => $wxr_version
                 );
         }
 }
@@ -224 +225 @@
         );
 
         function parse( $file ) {
-                $this->is_wxr_file = $this->in_post = $this->cdata = $this->data = $this->sub_data = $this->in_tag = $this->in_sub_tag = false;
+                $this->wxr_version = $this->in_post = $this->cdata = $this->data = $this->sub_data = $this->in_tag = $this->in_sub_tag = false;
                 $this->authors = $this->posts = $this->term = $this->category = $this->tag = array();
 
                 $xml = xml_parser_create( 'UTF-8' );
@@ -243 +244 @@
                 }
                 xml_parser_free( $xml );
 
-                if ( ! $this->is_wxr_file )
+                if ( ! preg_match( '/^\d+\.\d+$/', $this->wxr_version ) )
                         return new WP_Error( 'WXR_parse_error', __( 'This does not appear to be a WXR file, missing/invalid WXR version number', 'wordpress-importer' ) );
 
                 return array(
@@ -252 +253 @@
                         'categories' => $this->category,
                         'tags' => $this->tag,
                         'terms' => $this->term,
-                        'base_url' => $this->base_url
+                        'base_url' => $this->base_url,
+                        'version' => $this->wxr_version
                 );
         }
 
@@ -333 +335 @@
                                 $this->base_url = $this->cdata;
                                 break;
                         case 'wp:wxr_version':
-                                $this->is_wxr_file = preg_match( '/^\d+\.\d+$/', $this->cdata );
+                                $this->wxr_version = $this->cdata;
                                 break;
 
                         default:
@@ -370 +372 @@
         }
 
         function parse( $file ) {
-                $is_wxr = $in_post = false;
+                $wxr_version = $in_post = false;
 
                 $fp = $this->fopen( $file, 'r' );
                 if ( $fp ) {
                         while ( ! $this->feof( $fp ) ) {
                                 $importline = rtrim( $this->fgets( $fp ) );
 
-                                if ( ! $is_wxr && preg_match( '|<wp:wxr_version>\d+\.\d+</wp:wxr_version>|', $importline ) )
-                                        $is_wxr = true;
+                                if ( ! $wxr_version && preg_match( '|<wp:wxr_version>(\d+\.\d+)</wp:wxr_version>|', $importline, $version ) )
+                                        $wxr_version = $version[1];
 
                                 if ( false !== strpos( $importline, '<wp:base_site_url>' ) ) {
                                         preg_match( '|<wp:base_site_url>(.*?)</wp:base_site_url>|is', $importline, $url );
@@ -433 +435 @@
                         'categories' => $this->categories,
                         'tags' => $this->tags,
                         'terms' => $this->terms,
-                        'base_url' => $this->base_url
+                        'base_url' => $this->base_url,
+                        'version' => $wxr_version
                 );
         }
 

trunk/wordpress-importer.php

@@ -35 +35 @@
  */
 if ( class_exists( 'WP_Importer' ) ) {
 class WP_Import extends WP_Importer {
+        var $wxr_version = 1.1; // max. supported WXR version
+
         var $id; // WXR attachment ID
 
         // information to import from WXR file
@@ -197 +199 @@
                         return false;
                 }
 
+                if ( $import_data['version'] > $this->wxr_version ) {
+                        echo '<div class="error"><p><strong>';
+                        printf( __( 'This WXR file (version %s) may not be supported by this version of the importer, please try upgrading.', 'wordpress-importer' ), esc_html($import_data['version']) );
+                        echo '</strong></p></div>';
+                }
+
                 $this->get_authors_from_import( $import_data );
 
                 return true;
@@ -903 +911 @@
                 echo '<div class="wrap">';
                 screen_icon();
                 echo '<h2>' . __( 'Import WordPress', 'wordpress-importer' ) . '</h2>';
+
+                $updates = get_plugin_updates();
+                $basename = plugin_basename(__FILE__);
+                if ( isset( $updates[$basename] ) ) {
+                        $update = $updates[$basename];
+                        echo '<div class="error"><p><strong>';
+                        printf( __( 'A new version (%s) of this importer is available. Please upgrade to ensure compatibility with newer export files.', 'wordpress-importer' ), $update->update->new_version );
+                        echo '</strong></p></div>';
+                }
         }
 
         // Close div.wrap