Changeset 501867

Timestamp:

02/07/2012 10:00:03 PM (14 years ago)

Author:

duck_

Message:

Add support for escaped closing CDATA sequences "]]]]><![CDATA[>" (WXR_VERSION 1.2) to the regex parser. See ​http://core.trac.wordpress.org/ticket/15203.

Location:

wordpress-importer/trunk

Files:

• parsers.php (modified) (1 diff)
• wordpress-importer.php (modified) (2 diffs)

wordpress-importer/trunk/parsers.php

@@ -466 +466 @@
         preg_match( "|<$tag.*?>(.*?)</$tag>|is", $string, $return );
         if ( isset( $return[1] ) ) {
-            $return = preg_replace( '|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1] );
+            if ( substr( $return[1], 0, 9 ) == '<![CDATA[' ) {
+                if ( strpos( $return[1], ']]]]><![CDATA[>' ) !== false ) {
+                    preg_match_all( '|<!\[CDATA\[(.*?)\]\]>|s', $return[1], $matches );
+                    $return = '';
+                    foreach( $matches[1] as $match )
+                        $return .= $match;
+                } else {
+                    $return = preg_replace( '|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1] );
+                }
+            } else {
+                $return = $return[1];
+            }
             $return = $wpdb->escape( trim( $return ) );
         } else {

wordpress-importer/trunk/wordpress-importer.php

@@ -6 +6 @@
 Author: wordpressdotorg
 Author URI: http://wordpress.org/
-Version: 0.5
+Version: 0.5.1
 Text Domain: wordpress-importer
 License: GPL version 2 or later - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
@@ -37 +37 @@
 if ( class_exists( 'WP_Importer' ) ) {
 class WP_Import extends WP_Importer {
-    var $max_wxr_version = 1.1; // max. supported WXR version
+    var $max_wxr_version = 1.2; // max. supported WXR version
 
     var $id; // WXR attachment ID