Update WordPress Importer plugin from 0.9.3 to 0.9.4

Author: bitpoke-bot

wp-content/plugins/wordpress-importer/parsers/class-wxr-parser-regex.php

@@ -43,27 +43,29 @@ public function parse( $file ) {
 				$importline  = rtrim( $this->fgets( $fp ) );
 
 				if ( ! $wxr_version && preg_match( '|<wp:wxr_version>(\d+\.\d+)</wp:wxr_version>|', $importline, $version ) ) {
-					$wxr_version = $version[1];
+					$wxr_version = isset( $version[1] ) ? $version[1] : '';
 				}
 
 				if ( false !== strpos( $importline, '<wp:base_site_url>' ) ) {
 					preg_match( '|<wp:base_site_url>(.*?)</wp:base_site_url>|is', $importline, $url );
-					$this->base_url = $url[1];
+					$this->base_url = isset( $url[1] ) ? $url[1] : '';
 					continue;
 				}
 
 				if ( false !== strpos( $importline, '<wp:base_blog_url>' ) ) {
 					preg_match( '|<wp:base_blog_url>(.*?)</wp:base_blog_url>|is', $importline, $blog_url );
-					$this->base_blog_url = $blog_url[1];
+					$this->base_blog_url = isset( $blog_url[1] ) ? $blog_url[1] : '';
 					continue;
 				} elseif ( empty( $this->base_blog_url ) ) {
 					$this->base_blog_url = $this->base_url;
 				}
 
 				if ( false !== strpos( $importline, '<wp:author>' ) ) {
 					preg_match( '|<wp:author>(.*?)</wp:author>|is', $importline, $author );
-					$a                                   = $this->process_author( $author[1] );
-					$this->authors[ $a['author_login'] ] = $a;
+					if ( isset( $author[1] ) ) {
+						$a                                   = $this->process_author( $author[1] );
+						$this->authors[ $a['author_login'] ] = $a;
+					}
 					continue;
 				}
 
@@ -72,7 +74,7 @@ public function parse( $file ) {
 					$pos         = strpos( $importline, "<$tag>" );
 					$pos_closing = strpos( $importline, "</$tag>" );
 					if ( preg_match( '|<' . $tag . '>(.*?)</' . $tag . '>|is', $importline, $matches ) ) {
-						$this->{$handler[0]}[] = call_user_func( $handler[1], $matches[1] );
+						$this->{$handler[0]}[] = call_user_func( $handler[1], isset( $matches[1] ) ? $matches[1] : '' );
 
 					} elseif ( false !== $pos ) {
 						// Take note of any content after the opening tag
@@ -115,14 +117,19 @@ public function parse( $file ) {
 	}
 
 	public function get_tag( $text, $tag ) {
+		if ( null === $text ) {
+			return '';
+		}
 		preg_match( "|<$tag.*?>(.*?)</$tag>|is", $text, $return );
 		if ( isset( $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;
+					if ( isset( $matches[1] ) ) {
+						foreach ( $matches[1] as $match ) {
+							$return .= $match;
+						}
 					}
 				} else {
 					$return = preg_replace( '|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1] );

wp-content/plugins/wordpress-importer/php-toolkit/DataLiberation/BlockMarkup/class-blockmarkupprocessor.php

@@ -496,7 +496,8 @@ private function block_attribute_updates_to_modifiable_text_updates() {
 			' ' .
 			$this->block_name .
 			' ' .
-			$encoded_attributes
+			$encoded_attributes .
+			( $this->is_self_closing_block() ? '/' : '' )
 		);
 
 		return true;

wp-content/plugins/wordpress-importer/readme.txt

@@ -5,7 +5,7 @@ Tags: importer, wordpress
 Requires at least: 5.2
 Tested up to: 6.8
 Requires PHP: 7.2
-Stable tag: 0.9.3
+Stable tag: 0.9.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -40,6 +40,9 @@ If you would prefer to do things manually then follow these instructions:
 
 == Changelog ==
 
+= 0.9.4 =
+* Fix a bug that caused self-closing blocks to be incorrectly serialized during URL rewriting.
+
 = 0.9.3 =
 * Rewrite attachment URLs to the new URL structure
 

wp-content/plugins/wordpress-importer/wordpress-importer.php

@@ -6,7 +6,7 @@
  * Description:       Import posts, pages, comments, custom fields, categories, tags and more from a WordPress export file.
  * Author:            wordpressdotorg
  * Author URI:        https://wordpress.org/
- * Version:           0.9.3
+ * Version:           0.9.4
  * Requires at least: 5.2
  * Requires PHP:      7.2
  * Text Domain:       wordpress-importer