Ticket #11574: 11574-improved.diff

wordpress/wp-admin/import/wordpress.php

@@ -59 +59 @@
 
         function get_tag( $string, $tag ) {
                 global $wpdb;
-                preg_match("|<$tag.*?>(.*?)</$tag>|is", $string, $return);
-                if ( isset($return[1]) ) {
-                        $return = preg_replace('|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1]);
-                        $return = $wpdb->escape( trim( $return ) );
+                preg_match("@(<$tag.*?><!\[CDATA\[(.*?)\]\]></$tag>|<$tag.*?>(.*?)</$tag>)@is", $string, $return);
+                if ( !empty($return[2]) ) {
+                        $return = $wpdb->escape( trim( $return[2] ) );
+                } else if ( !empty($return[3]) ) {
+                        $return = $wpdb->escape( trim( $return[3] ) );
                 } else {
                         $return = '';
                 }