patilswapnilv / shortcodely

tests/phpunit/data/plugins/wordpress-importer/parsers.php

Doc Comments +22 added lines

@@ -10,6 +10,10 @@ 
  * WordPress Importer class for managing parsing of WXR files.
  */
 class WXR_Parser {
+
+	/**
+	 * @param string $file
+	 */
 	function parse( $file ) {
 		// Attempt to use proper XML parsers first
 		if ( extension_loaded( 'simplexml' ) ) {
@@ -525,6 +529,9 @@ 
 		);
 	}
 
+	/**
+	 * @param string $tag
+	 */
 	function get_tag( $string, $tag ) {
 		preg_match( "|<$tag.*?>(.*?)</$tag>|is", $string, $return );
 		if ( isset( $return[1] ) ) {
@@ -547,6 +554,9 @@ 
 		return $return;
 	}
 
+	/**
+	 * @param string $c
+	 */
 	function process_category( $c ) {
 		return array(
 			'term_id' => $this->get_tag( $c, 'wp:term_id' ),
@@ -557,6 +567,9 @@ 
 		);
 	}
 
+	/**
+	 * @param string $t
+	 */
 	function process_tag( $t ) {
 		return array(
 			'term_id' => $this->get_tag( $t, 'wp:term_id' ),
@@ -566,6 +579,9 @@ 
 		);
 	}
 
+	/**
+	 * @param string $t
+	 */
 	function process_term( $t ) {
 		return array(
 			'term_id' => $this->get_tag( $t, 'wp:term_id' ),
@@ -577,6 +593,9 @@ 
 		);
 	}
 
+	/**
+	 * @param string $a
+	 */
 	function process_author( $a ) {
 		return array(
 			'author_id' => $this->get_tag( $a, 'wp:author_id' ),
@@ -588,6 +607,9 @@ 
 		);
 	}
 
+	/**
+	 * @param string $post
+	 */
 	function process_post( $post ) {
 		$post_id        = $this->get_tag( $post, 'wp:post_id' );
 		$post_title     = $this->get_tag( $post, 'title' );

Indentation +692 added lines, -692 removed lines

@@ -10,714 +10,714 @@
  * WordPress Importer class for managing parsing of WXR files.
  */
 class WXR_Parser {
-	function parse( $file ) {
-		// Attempt to use proper XML parsers first
-		if ( extension_loaded( 'simplexml' ) ) {
-			$parser = new WXR_Parser_SimpleXML;
-			$result = $parser->parse( $file );
-
-			// If SimpleXML succeeds or this is an invalid WXR file then return the results
-			if ( ! is_wp_error( $result ) || 'SimpleXML_parse_error' != $result->get_error_code() ) {
-							return $result;
-			}
-		} else if ( extension_loaded( 'xml' ) ) {
-			$parser = new WXR_Parser_XML;
-			$result = $parser->parse( $file );
-
-			// If XMLParser succeeds or this is an invalid WXR file then return the results
-			if ( ! is_wp_error( $result ) || 'XML_parse_error' != $result->get_error_code() ) {
-							return $result;
-			}
-		}
-
-		// We have a malformed XML file, so display the error and fallthrough to regex
-		if ( isset($result) && defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
-			echo '<pre>';
-			if ( 'SimpleXML_parse_error' == $result->get_error_code() ) {
-				foreach  ( $result->get_error_data() as $error ) {
-									echo $error->line . ':' . $error->column . ' ' . esc_html( $error->message ) . "\n";
-				}
-			} else if ( 'XML_parse_error' == $result->get_error_code() ) {
-				$error = $result->get_error_data();
-				echo $error[0] . ':' . $error[1] . ' ' . esc_html( $error[2] );
-			}
-			echo '</pre>';
-			echo '<p><strong>' . __( 'There was an error when reading this WXR file', 'wordpress-importer' ) . '</strong><br />';
-			echo __( 'Details are shown above. The importer will now try again with a different parser...', 'wordpress-importer' ) . '</p>';
-		}
-
-		// use regular expressions if nothing else available or this is bad XML
-		$parser = new WXR_Parser_Regex;
-		return $parser->parse( $file );
-	}
+    function parse( $file ) {
+        // Attempt to use proper XML parsers first
+        if ( extension_loaded( 'simplexml' ) ) {
+            $parser = new WXR_Parser_SimpleXML;
+            $result = $parser->parse( $file );
+
+            // If SimpleXML succeeds or this is an invalid WXR file then return the results
+            if ( ! is_wp_error( $result ) || 'SimpleXML_parse_error' != $result->get_error_code() ) {
+                            return $result;
+            }
+        } else if ( extension_loaded( 'xml' ) ) {
+            $parser = new WXR_Parser_XML;
+            $result = $parser->parse( $file );
+
+            // If XMLParser succeeds or this is an invalid WXR file then return the results
+            if ( ! is_wp_error( $result ) || 'XML_parse_error' != $result->get_error_code() ) {
+                            return $result;
+            }
+        }
+
+        // We have a malformed XML file, so display the error and fallthrough to regex
+        if ( isset($result) && defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+            echo '<pre>';
+            if ( 'SimpleXML_parse_error' == $result->get_error_code() ) {
+                foreach  ( $result->get_error_data() as $error ) {
+                                    echo $error->line . ':' . $error->column . ' ' . esc_html( $error->message ) . "\n";
+                }
+            } else if ( 'XML_parse_error' == $result->get_error_code() ) {
+                $error = $result->get_error_data();
+                echo $error[0] . ':' . $error[1] . ' ' . esc_html( $error[2] );
+            }
+            echo '</pre>';
+            echo '<p><strong>' . __( 'There was an error when reading this WXR file', 'wordpress-importer' ) . '</strong><br />';
+            echo __( 'Details are shown above. The importer will now try again with a different parser...', 'wordpress-importer' ) . '</p>';
+        }
+
+        // use regular expressions if nothing else available or this is bad XML
+        $parser = new WXR_Parser_Regex;
+        return $parser->parse( $file );
+    }
 }
 
 /**
  * WXR Parser that makes use of the SimpleXML PHP extension.
  */
 class WXR_Parser_SimpleXML {
-	function parse( $file ) {
-		$authors = $posts = $categories = $tags = $terms = array();
-
-		$internal_errors = libxml_use_internal_errors(true);
-
-		$dom = new DOMDocument;
-		$old_value = null;
-		if ( function_exists( 'libxml_disable_entity_loader' ) ) {
-			$old_value = libxml_disable_entity_loader( true );
-		}
-		$success = $dom->loadXML( file_get_contents( $file ) );
-		if ( ! is_null( $old_value ) ) {
-			libxml_disable_entity_loader( $old_value );
-		}
-
-		if ( ! $success || isset( $dom->doctype ) ) {
-			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this WXR file', 'wordpress-importer' ), libxml_get_errors() );
-		}
-
-		$xml = simplexml_import_dom( $dom );
-		unset( $dom );
-
-		// halt if loading produces an error
-		if ( ! $xml ) {
-					return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this WXR file', 'wordpress-importer' ), libxml_get_errors() );
-		}
-
-		$wxr_version = $xml->xpath('/rss/channel/wp:wxr_version');
-		if ( ! $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' ) );
-		}
-
-		$wxr_version = (string) trim( $wxr_version[0] );
-		// confirm that we are dealing with the correct file format
-		if ( ! preg_match( '/^\d+\.\d+$/', $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' ) );
-		}
-
-		$base_url = $xml->xpath('/rss/channel/wp:base_site_url');
-		$base_url = (string) trim( $base_url[0] );
-
-		$namespaces = $xml->getDocNamespaces();
-		if ( ! isset( $namespaces['wp'] ) ) {
-					$namespaces['wp'] = 'http://wordpress.org/export/1.1/';
-		}
-		if ( ! isset( $namespaces['excerpt'] ) ) {
-					$namespaces['excerpt'] = 'http://wordpress.org/export/1.1/excerpt/';
-		}
-
-		// grab authors
-		foreach ( $xml->xpath('/rss/channel/wp:author') as $author_arr ) {
-			$a = $author_arr->children( $namespaces['wp'] );
-			$login = (string) $a->author_login;
-			$authors[$login] = array(
-				'author_id' => (int) $a->author_id,
-				'author_login' => $login,
-				'author_email' => (string) $a->author_email,
-				'author_display_name' => (string) $a->author_display_name,
-				'author_first_name' => (string) $a->author_first_name,
-				'author_last_name' => (string) $a->author_last_name
-			);
-		}
-
-		// grab cats, tags and terms
-		foreach ( $xml->xpath('/rss/channel/wp:category') as $term_arr ) {
-			$t = $term_arr->children( $namespaces['wp'] );
-			$category = array(
-				'term_id' => (int) $t->term_id,
-				'category_nicename' => (string) $t->category_nicename,
-				'category_parent' => (string) $t->category_parent,
-				'cat_name' => (string) $t->cat_name,
-				'category_description' => (string) $t->category_description
-			);
-
-			foreach ( $t->termmeta as $meta ) {
-				$category['termmeta'][] = array(
-					'key' => (string) $meta->meta_key,
-					'value' => (string) $meta->meta_value
-				);
-			}
-
-			$categories[] = $category;
-		}
-
-		foreach ( $xml->xpath('/rss/channel/wp:tag') as $term_arr ) {
-			$t = $term_arr->children( $namespaces['wp'] );
-			$tag = array(
-				'term_id' => (int) $t->term_id,
-				'tag_slug' => (string) $t->tag_slug,
-				'tag_name' => (string) $t->tag_name,
-				'tag_description' => (string) $t->tag_description
-			);
-
-			foreach ( $t->termmeta as $meta ) {
-				$tag['termmeta'][] = array(
-					'key' => (string) $meta->meta_key,
-					'value' => (string) $meta->meta_value
-				);
-			}
-
-			$tags[] = $tag;
-		}
-
-		foreach ( $xml->xpath('/rss/channel/wp:term') as $term_arr ) {
-			$t = $term_arr->children( $namespaces['wp'] );
-			$term = array(
-				'term_id' => (int) $t->term_id,
-				'term_taxonomy' => (string) $t->term_taxonomy,
-				'slug' => (string) $t->term_slug,
-				'term_parent' => (string) $t->term_parent,
-				'term_name' => (string) $t->term_name,
-				'term_description' => (string) $t->term_description
-			);
-
-			foreach ( $t->termmeta as $meta ) {
-				$term['termmeta'][] = array(
-					'key' => (string) $meta->meta_key,
-					'value' => (string) $meta->meta_value
-				);
-			}
-
-			$terms[] = $term;
-		}
-
-		// grab posts
-		foreach ( $xml->channel->item as $item ) {
-			$post = array(
-				'post_title' => (string) $item->title,
-				'guid' => (string) $item->guid,
-			);
-
-			$dc = $item->children( 'http://purl.org/dc/elements/1.1/' );
-			$post['post_author'] = (string) $dc->creator;
-
-			$content = $item->children( 'http://purl.org/rss/1.0/modules/content/' );
-			$excerpt = $item->children( $namespaces['excerpt'] );
-			$post['post_content'] = (string) $content->encoded;
-			$post['post_excerpt'] = (string) $excerpt->encoded;
-
-			$wp = $item->children( $namespaces['wp'] );
-			$post['post_id'] = (int) $wp->post_id;
-			$post['post_date'] = (string) $wp->post_date;
-			$post['post_date_gmt'] = (string) $wp->post_date_gmt;
-			$post['comment_status'] = (string) $wp->comment_status;
-			$post['ping_status'] = (string) $wp->ping_status;
-			$post['post_name'] = (string) $wp->post_name;
-			$post['status'] = (string) $wp->status;
-			$post['post_parent'] = (int) $wp->post_parent;
-			$post['menu_order'] = (int) $wp->menu_order;
-			$post['post_type'] = (string) $wp->post_type;
-			$post['post_password'] = (string) $wp->post_password;
-			$post['is_sticky'] = (int) $wp->is_sticky;
-
-			if ( isset($wp->attachment_url) ) {
-							$post['attachment_url'] = (string) $wp->attachment_url;
-			}
-
-			foreach ( $item->category as $c ) {
-				$att = $c->attributes();
-				if ( isset( $att['nicename'] ) ) {
-									$post['terms'][] = array(
-						'name' => (string) $c,
-						'slug' => (string) $att['nicename'],
-						'domain' => (string) $att['domain']
-					);
-				}
-			}
-
-			foreach ( $wp->postmeta as $meta ) {
-				$post['postmeta'][] = array(
-					'key' => (string) $meta->meta_key,
-					'value' => (string) $meta->meta_value
-				);
-			}
-
-			foreach ( $wp->comment as $comment ) {
-				$meta = array();
-				if ( isset( $comment->commentmeta ) ) {
-					foreach ( $comment->commentmeta as $m ) {
-						$meta[] = array(
-							'key' => (string) $m->meta_key,
-							'value' => (string) $m->meta_value
-						);
-					}
-				}
-
-				$post['comments'][] = array(
-					'comment_id' => (int) $comment->comment_id,
-					'comment_author' => (string) $comment->comment_author,
-					'comment_author_email' => (string) $comment->comment_author_email,
-					'comment_author_IP' => (string) $comment->comment_author_IP,
-					'comment_author_url' => (string) $comment->comment_author_url,
-					'comment_date' => (string) $comment->comment_date,
-					'comment_date_gmt' => (string) $comment->comment_date_gmt,
-					'comment_content' => (string) $comment->comment_content,
-					'comment_approved' => (string) $comment->comment_approved,
-					'comment_type' => (string) $comment->comment_type,
-					'comment_parent' => (string) $comment->comment_parent,
-					'comment_user_id' => (int) $comment->comment_user_id,
-					'commentmeta' => $meta,
-				);
-			}
-
-			$posts[] = $post;
-		}
-
-		return array(
-			'authors' => $authors,
-			'posts' => $posts,
-			'categories' => $categories,
-			'tags' => $tags,
-			'terms' => $terms,
-			'base_url' => $base_url,
-			'version' => $wxr_version
-		);
-	}
+    function parse( $file ) {
+        $authors = $posts = $categories = $tags = $terms = array();
+
+        $internal_errors = libxml_use_internal_errors(true);
+
+        $dom = new DOMDocument;
+        $old_value = null;
+        if ( function_exists( 'libxml_disable_entity_loader' ) ) {
+            $old_value = libxml_disable_entity_loader( true );
+        }
+        $success = $dom->loadXML( file_get_contents( $file ) );
+        if ( ! is_null( $old_value ) ) {
+            libxml_disable_entity_loader( $old_value );
+        }
+
+        if ( ! $success || isset( $dom->doctype ) ) {
+            return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this WXR file', 'wordpress-importer' ), libxml_get_errors() );
+        }
+
+        $xml = simplexml_import_dom( $dom );
+        unset( $dom );
+
+        // halt if loading produces an error
+        if ( ! $xml ) {
+                    return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this WXR file', 'wordpress-importer' ), libxml_get_errors() );
+        }
+
+        $wxr_version = $xml->xpath('/rss/channel/wp:wxr_version');
+        if ( ! $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' ) );
+        }
+
+        $wxr_version = (string) trim( $wxr_version[0] );
+        // confirm that we are dealing with the correct file format
+        if ( ! preg_match( '/^\d+\.\d+$/', $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' ) );
+        }
+
+        $base_url = $xml->xpath('/rss/channel/wp:base_site_url');
+        $base_url = (string) trim( $base_url[0] );
+
+        $namespaces = $xml->getDocNamespaces();
+        if ( ! isset( $namespaces['wp'] ) ) {
+                    $namespaces['wp'] = 'http://wordpress.org/export/1.1/';
+        }
+        if ( ! isset( $namespaces['excerpt'] ) ) {
+                    $namespaces['excerpt'] = 'http://wordpress.org/export/1.1/excerpt/';
+        }
+
+        // grab authors
+        foreach ( $xml->xpath('/rss/channel/wp:author') as $author_arr ) {
+            $a = $author_arr->children( $namespaces['wp'] );
+            $login = (string) $a->author_login;
+            $authors[$login] = array(
+                'author_id' => (int) $a->author_id,
+                'author_login' => $login,
+                'author_email' => (string) $a->author_email,
+                'author_display_name' => (string) $a->author_display_name,
+                'author_first_name' => (string) $a->author_first_name,
+                'author_last_name' => (string) $a->author_last_name
+            );
+        }
+
+        // grab cats, tags and terms
+        foreach ( $xml->xpath('/rss/channel/wp:category') as $term_arr ) {
+            $t = $term_arr->children( $namespaces['wp'] );
+            $category = array(
+                'term_id' => (int) $t->term_id,
+                'category_nicename' => (string) $t->category_nicename,
+                'category_parent' => (string) $t->category_parent,
+                'cat_name' => (string) $t->cat_name,
+                'category_description' => (string) $t->category_description
+            );
+
+            foreach ( $t->termmeta as $meta ) {
+                $category['termmeta'][] = array(
+                    'key' => (string) $meta->meta_key,
+                    'value' => (string) $meta->meta_value
+                );
+            }
+
+            $categories[] = $category;
+        }
+
+        foreach ( $xml->xpath('/rss/channel/wp:tag') as $term_arr ) {
+            $t = $term_arr->children( $namespaces['wp'] );
+            $tag = array(
+                'term_id' => (int) $t->term_id,
+                'tag_slug' => (string) $t->tag_slug,
+                'tag_name' => (string) $t->tag_name,
+                'tag_description' => (string) $t->tag_description
+            );
+
+            foreach ( $t->termmeta as $meta ) {
+                $tag['termmeta'][] = array(
+                    'key' => (string) $meta->meta_key,
+                    'value' => (string) $meta->meta_value
+                );
+            }
+
+            $tags[] = $tag;
+        }
+
+        foreach ( $xml->xpath('/rss/channel/wp:term') as $term_arr ) {
+            $t = $term_arr->children( $namespaces['wp'] );
+            $term = array(
+                'term_id' => (int) $t->term_id,
+                'term_taxonomy' => (string) $t->term_taxonomy,
+                'slug' => (string) $t->term_slug,
+                'term_parent' => (string) $t->term_parent,
+                'term_name' => (string) $t->term_name,
+                'term_description' => (string) $t->term_description
+            );
+
+            foreach ( $t->termmeta as $meta ) {
+                $term['termmeta'][] = array(
+                    'key' => (string) $meta->meta_key,
+                    'value' => (string) $meta->meta_value
+                );
+            }
+
+            $terms[] = $term;
+        }
+
+        // grab posts
+        foreach ( $xml->channel->item as $item ) {
+            $post = array(
+                'post_title' => (string) $item->title,
+                'guid' => (string) $item->guid,
+            );
+
+            $dc = $item->children( 'http://purl.org/dc/elements/1.1/' );
+            $post['post_author'] = (string) $dc->creator;
+
+            $content = $item->children( 'http://purl.org/rss/1.0/modules/content/' );
+            $excerpt = $item->children( $namespaces['excerpt'] );
+            $post['post_content'] = (string) $content->encoded;
+            $post['post_excerpt'] = (string) $excerpt->encoded;
+
+            $wp = $item->children( $namespaces['wp'] );
+            $post['post_id'] = (int) $wp->post_id;
+            $post['post_date'] = (string) $wp->post_date;
+            $post['post_date_gmt'] = (string) $wp->post_date_gmt;
+            $post['comment_status'] = (string) $wp->comment_status;
+            $post['ping_status'] = (string) $wp->ping_status;
+            $post['post_name'] = (string) $wp->post_name;
+            $post['status'] = (string) $wp->status;
+            $post['post_parent'] = (int) $wp->post_parent;
+            $post['menu_order'] = (int) $wp->menu_order;
+            $post['post_type'] = (string) $wp->post_type;
+            $post['post_password'] = (string) $wp->post_password;
+            $post['is_sticky'] = (int) $wp->is_sticky;
+
+            if ( isset($wp->attachment_url) ) {
+                            $post['attachment_url'] = (string) $wp->attachment_url;
+            }
+
+            foreach ( $item->category as $c ) {
+                $att = $c->attributes();
+                if ( isset( $att['nicename'] ) ) {
+                                    $post['terms'][] = array(
+                        'name' => (string) $c,
+                        'slug' => (string) $att['nicename'],
+                        'domain' => (string) $att['domain']
+                    );
+                }
+            }
+
+            foreach ( $wp->postmeta as $meta ) {
+                $post['postmeta'][] = array(
+                    'key' => (string) $meta->meta_key,
+                    'value' => (string) $meta->meta_value
+                );
+            }
+
+            foreach ( $wp->comment as $comment ) {
+                $meta = array();
+                if ( isset( $comment->commentmeta ) ) {
+                    foreach ( $comment->commentmeta as $m ) {
+                        $meta[] = array(
+                            'key' => (string) $m->meta_key,
+                            'value' => (string) $m->meta_value
+                        );
+                    }
+                }
+
+                $post['comments'][] = array(
+                    'comment_id' => (int) $comment->comment_id,
+                    'comment_author' => (string) $comment->comment_author,
+                    'comment_author_email' => (string) $comment->comment_author_email,
+                    'comment_author_IP' => (string) $comment->comment_author_IP,
+                    'comment_author_url' => (string) $comment->comment_author_url,
+                    'comment_date' => (string) $comment->comment_date,
+                    'comment_date_gmt' => (string) $comment->comment_date_gmt,
+                    'comment_content' => (string) $comment->comment_content,
+                    'comment_approved' => (string) $comment->comment_approved,
+                    'comment_type' => (string) $comment->comment_type,
+                    'comment_parent' => (string) $comment->comment_parent,
+                    'comment_user_id' => (int) $comment->comment_user_id,
+                    'commentmeta' => $meta,
+                );
+            }
+
+            $posts[] = $post;
+        }
+
+        return array(
+            'authors' => $authors,
+            'posts' => $posts,
+            'categories' => $categories,
+            'tags' => $tags,
+            'terms' => $terms,
+            'base_url' => $base_url,
+            'version' => $wxr_version
+        );
+    }
 }
 
 /**
  * WXR Parser that makes use of the XML Parser PHP extension.
  */
 class WXR_Parser_XML {
-	var $wp_tags = array(
-		'wp:post_id', 'wp:post_date', 'wp:post_date_gmt', 'wp:comment_status', 'wp:ping_status', 'wp:attachment_url',
-		'wp:status', 'wp:post_name', 'wp:post_parent', 'wp:menu_order', 'wp:post_type', 'wp:post_password',
-		'wp:is_sticky', 'wp:term_id', 'wp:category_nicename', 'wp:category_parent', 'wp:cat_name', 'wp:category_description',
-		'wp:tag_slug', 'wp:tag_name', 'wp:tag_description', 'wp:term_taxonomy', 'wp:term_parent',
-		'wp:term_name', 'wp:term_description', 'wp:author_id', 'wp:author_login', 'wp:author_email', 'wp:author_display_name',
-		'wp:author_first_name', 'wp:author_last_name',
-	);
-	var $wp_sub_tags = array(
-		'wp:comment_id', 'wp:comment_author', 'wp:comment_author_email', 'wp:comment_author_url',
-		'wp:comment_author_IP',	'wp:comment_date', 'wp:comment_date_gmt', 'wp:comment_content',
-		'wp:comment_approved', 'wp:comment_type', 'wp:comment_parent', 'wp:comment_user_id',
-	);
-
-	function parse( $file ) {
-		$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' );
-		xml_parser_set_option( $xml, XML_OPTION_SKIP_WHITE, 1 );
-		xml_parser_set_option( $xml, XML_OPTION_CASE_FOLDING, 0 );
-		xml_set_object( $xml, $this );
-		xml_set_character_data_handler( $xml, 'cdata' );
-		xml_set_element_handler( $xml, 'tag_open', 'tag_close' );
-
-		if ( ! xml_parse( $xml, file_get_contents( $file ), true ) ) {
-			$current_line = xml_get_current_line_number( $xml );
-			$current_column = xml_get_current_column_number( $xml );
-			$error_code = xml_get_error_code( $xml );
-			$error_string = xml_error_string( $error_code );
-			return new WP_Error( 'XML_parse_error', 'There was an error when reading this WXR file', array( $current_line, $current_column, $error_string ) );
-		}
-		xml_parser_free( $xml );
-
-		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(
-			'authors' => $this->authors,
-			'posts' => $this->posts,
-			'categories' => $this->category,
-			'tags' => $this->tag,
-			'terms' => $this->term,
-			'base_url' => $this->base_url,
-			'version' => $this->wxr_version
-		);
-	}
-
-	function tag_open( $parse, $tag, $attr ) {
-		if ( in_array( $tag, $this->wp_tags ) ) {
-			$this->in_tag = substr( $tag, 3 );
-			return;
-		}
-
-		if ( in_array( $tag, $this->wp_sub_tags ) ) {
-			$this->in_sub_tag = substr( $tag, 3 );
-			return;
-		}
-
-		switch ( $tag ) {
-			case 'category':
-				if ( isset($attr['domain'], $attr['nicename']) ) {
-					$this->sub_data['domain'] = $attr['domain'];
-					$this->sub_data['slug'] = $attr['nicename'];
-				}
-				break;
-			case 'item': $this->in_post = true;
-			case 'title': if ( $this->in_post ) {
-			    $this->in_tag = 'post_title';
-			}
-			break;
-			case 'guid': $this->in_tag = 'guid'; break;
-			case 'dc:creator': $this->in_tag = 'post_author'; break;
-			case 'content:encoded': $this->in_tag = 'post_content'; break;
-			case 'excerpt:encoded': $this->in_tag = 'post_excerpt'; break;
-
-			case 'wp:term_slug': $this->in_tag = 'slug'; break;
-			case 'wp:meta_key': $this->in_sub_tag = 'key'; break;
-			case 'wp:meta_value': $this->in_sub_tag = 'value'; break;
-		}
-	}
-
-	function cdata( $parser, $cdata ) {
-		if ( ! trim( $cdata ) ) {
-					return;
-		}
-
-		if ( false !== $this->in_tag || false !== $this->in_sub_tag ) {
-			$this->cdata .= $cdata;
-		} else {
-			$this->cdata .= trim( $cdata );
-		}
-	}
-
-	function tag_close( $parser, $tag ) {
-		switch ( $tag ) {
-			case 'wp:comment':
-				unset( $this->sub_data['key'], $this->sub_data['value'] ); // remove meta sub_data
-				if ( ! empty( $this->sub_data ) ) {
-									$this->data['comments'][] = $this->sub_data;
-				}
-				$this->sub_data = false;
-				break;
-			case 'wp:commentmeta':
-				$this->sub_data['commentmeta'][] = array(
-					'key' => $this->sub_data['key'],
-					'value' => $this->sub_data['value']
-				);
-				break;
-			case 'category':
-				if ( ! empty( $this->sub_data ) ) {
-					$this->sub_data['name'] = $this->cdata;
-					$this->data['terms'][] = $this->sub_data;
-				}
-				$this->sub_data = false;
-				break;
-			case 'wp:postmeta':
-				if ( ! empty( $this->sub_data ) ) {
-									$this->data['postmeta'][] = $this->sub_data;
-				}
-				$this->sub_data = false;
-				break;
-			case 'item':
-				$this->posts[] = $this->data;
-				$this->data = false;
-				break;
-			case 'wp:category':
-			case 'wp:tag':
-			case 'wp:term':
-				$n = substr( $tag, 3 );
-				array_push( $this->$n, $this->data );
-				$this->data = false;
-				break;
-			case 'wp:author':
-				if ( ! empty($this->data['author_login']) ) {
-									$this->authors[$this->data['author_login']] = $this->data;
-				}
-				$this->data = false;
-				break;
-			case 'wp:base_site_url':
-				$this->base_url = $this->cdata;
-				break;
-			case 'wp:wxr_version':
-				$this->wxr_version = $this->cdata;
-				break;
-
-			default:
-				if ( $this->in_sub_tag ) {
-					$this->sub_data[$this->in_sub_tag] = ! empty( $this->cdata ) ? $this->cdata : '';
-					$this->in_sub_tag = false;
-				} else if ( $this->in_tag ) {
-					$this->data[$this->in_tag] = ! empty( $this->cdata ) ? $this->cdata : '';
-					$this->in_tag = false;
-				}
-		}
-
-		$this->cdata = false;
-	}
+    var $wp_tags = array(
+        'wp:post_id', 'wp:post_date', 'wp:post_date_gmt', 'wp:comment_status', 'wp:ping_status', 'wp:attachment_url',
+        'wp:status', 'wp:post_name', 'wp:post_parent', 'wp:menu_order', 'wp:post_type', 'wp:post_password',
+        'wp:is_sticky', 'wp:term_id', 'wp:category_nicename', 'wp:category_parent', 'wp:cat_name', 'wp:category_description',
+        'wp:tag_slug', 'wp:tag_name', 'wp:tag_description', 'wp:term_taxonomy', 'wp:term_parent',
+        'wp:term_name', 'wp:term_description', 'wp:author_id', 'wp:author_login', 'wp:author_email', 'wp:author_display_name',
+        'wp:author_first_name', 'wp:author_last_name',
+    );
+    var $wp_sub_tags = array(
+        'wp:comment_id', 'wp:comment_author', 'wp:comment_author_email', 'wp:comment_author_url',
+        'wp:comment_author_IP',	'wp:comment_date', 'wp:comment_date_gmt', 'wp:comment_content',
+        'wp:comment_approved', 'wp:comment_type', 'wp:comment_parent', 'wp:comment_user_id',
+    );
+
+    function parse( $file ) {
+        $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' );
+        xml_parser_set_option( $xml, XML_OPTION_SKIP_WHITE, 1 );
+        xml_parser_set_option( $xml, XML_OPTION_CASE_FOLDING, 0 );
+        xml_set_object( $xml, $this );
+        xml_set_character_data_handler( $xml, 'cdata' );
+        xml_set_element_handler( $xml, 'tag_open', 'tag_close' );
+
+        if ( ! xml_parse( $xml, file_get_contents( $file ), true ) ) {
+            $current_line = xml_get_current_line_number( $xml );
+            $current_column = xml_get_current_column_number( $xml );
+            $error_code = xml_get_error_code( $xml );
+            $error_string = xml_error_string( $error_code );
+            return new WP_Error( 'XML_parse_error', 'There was an error when reading this WXR file', array( $current_line, $current_column, $error_string ) );
+        }
+        xml_parser_free( $xml );
+
+        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(
+            'authors' => $this->authors,
+            'posts' => $this->posts,
+            'categories' => $this->category,
+            'tags' => $this->tag,
+            'terms' => $this->term,
+            'base_url' => $this->base_url,
+            'version' => $this->wxr_version
+        );
+    }
+
+    function tag_open( $parse, $tag, $attr ) {
+        if ( in_array( $tag, $this->wp_tags ) ) {
+            $this->in_tag = substr( $tag, 3 );
+            return;
+        }
+
+        if ( in_array( $tag, $this->wp_sub_tags ) ) {
+            $this->in_sub_tag = substr( $tag, 3 );
+            return;
+        }
+
+        switch ( $tag ) {
+            case 'category':
+                if ( isset($attr['domain'], $attr['nicename']) ) {
+                    $this->sub_data['domain'] = $attr['domain'];
+                    $this->sub_data['slug'] = $attr['nicename'];
+                }
+                break;
+            case 'item': $this->in_post = true;
+            case 'title': if ( $this->in_post ) {
+                $this->in_tag = 'post_title';
+            }
+            break;
+            case 'guid': $this->in_tag = 'guid'; break;
+            case 'dc:creator': $this->in_tag = 'post_author'; break;
+            case 'content:encoded': $this->in_tag = 'post_content'; break;
+            case 'excerpt:encoded': $this->in_tag = 'post_excerpt'; break;
+
+            case 'wp:term_slug': $this->in_tag = 'slug'; break;
+            case 'wp:meta_key': $this->in_sub_tag = 'key'; break;
+            case 'wp:meta_value': $this->in_sub_tag = 'value'; break;
+        }
+    }
+
+    function cdata( $parser, $cdata ) {
+        if ( ! trim( $cdata ) ) {
+                    return;
+        }
+
+        if ( false !== $this->in_tag || false !== $this->in_sub_tag ) {
+            $this->cdata .= $cdata;
+        } else {
+            $this->cdata .= trim( $cdata );
+        }
+    }
+
+    function tag_close( $parser, $tag ) {
+        switch ( $tag ) {
+            case 'wp:comment':
+                unset( $this->sub_data['key'], $this->sub_data['value'] ); // remove meta sub_data
+                if ( ! empty( $this->sub_data ) ) {
+                                    $this->data['comments'][] = $this->sub_data;
+                }
+                $this->sub_data = false;
+                break;
+            case 'wp:commentmeta':
+                $this->sub_data['commentmeta'][] = array(
+                    'key' => $this->sub_data['key'],
+                    'value' => $this->sub_data['value']
+                );
+                break;
+            case 'category':
+                if ( ! empty( $this->sub_data ) ) {
+                    $this->sub_data['name'] = $this->cdata;
+                    $this->data['terms'][] = $this->sub_data;
+                }
+                $this->sub_data = false;
+                break;
+            case 'wp:postmeta':
+                if ( ! empty( $this->sub_data ) ) {
+                                    $this->data['postmeta'][] = $this->sub_data;
+                }
+                $this->sub_data = false;
+                break;
+            case 'item':
+                $this->posts[] = $this->data;
+                $this->data = false;
+                break;
+            case 'wp:category':
+            case 'wp:tag':
+            case 'wp:term':
+                $n = substr( $tag, 3 );
+                array_push( $this->$n, $this->data );
+                $this->data = false;
+                break;
+            case 'wp:author':
+                if ( ! empty($this->data['author_login']) ) {
+                                    $this->authors[$this->data['author_login']] = $this->data;
+                }
+                $this->data = false;
+                break;
+            case 'wp:base_site_url':
+                $this->base_url = $this->cdata;
+                break;
+            case 'wp:wxr_version':
+                $this->wxr_version = $this->cdata;
+                break;
+
+            default:
+                if ( $this->in_sub_tag ) {
+                    $this->sub_data[$this->in_sub_tag] = ! empty( $this->cdata ) ? $this->cdata : '';
+                    $this->in_sub_tag = false;
+                } else if ( $this->in_tag ) {
+                    $this->data[$this->in_tag] = ! empty( $this->cdata ) ? $this->cdata : '';
+                    $this->in_tag = false;
+                }
+        }
+
+        $this->cdata = false;
+    }
 }
 
 /**
  * WXR Parser that uses regular expressions. Fallback for installs without an XML parser.
  */
 class WXR_Parser_Regex {
-	var $authors = array();
-	var $posts = array();
-	var $categories = array();
-	var $tags = array();
-	var $terms = array();
-	var $base_url = '';
-
-	function __construct() {
-		$this->has_gzip = is_callable( 'gzopen' );
-	}
-
-	function parse( $file ) {
-		$wxr_version = $in_post = false;
-
-		$fp = $this->fopen( $file, 'r' );
-		if ( $fp ) {
-			while ( ! $this->feof( $fp ) ) {
-				$importline = rtrim( $this->fgets( $fp ) );
-
-				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 );
-					$this->base_url = $url[1];
-					continue;
-				}
-				if ( false !== strpos( $importline, '<wp:category>' ) ) {
-					preg_match( '|<wp:category>(.*?)</wp:category>|is', $importline, $category );
-					$this->categories[] = $this->process_category( $category[1] );
-					continue;
-				}
-				if ( false !== strpos( $importline, '<wp:tag>' ) ) {
-					preg_match( '|<wp:tag>(.*?)</wp:tag>|is', $importline, $tag );
-					$this->tags[] = $this->process_tag( $tag[1] );
-					continue;
-				}
-				if ( false !== strpos( $importline, '<wp:term>' ) ) {
-					preg_match( '|<wp:term>(.*?)</wp:term>|is', $importline, $term );
-					$this->terms[] = $this->process_term( $term[1] );
-					continue;
-				}
-				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;
-					continue;
-				}
-				if ( false !== strpos( $importline, '<item>' ) ) {
-					$post = '';
-					$in_post = true;
-					continue;
-				}
-				if ( false !== strpos( $importline, '</item>' ) ) {
-					$in_post = false;
-					$this->posts[] = $this->process_post( $post );
-					continue;
-				}
-				if ( $in_post ) {
-					$post .= $importline . "\n";
-				}
-			}
-
-			$this->fclose($fp);
-		}
-
-		if ( ! $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(
-			'authors' => $this->authors,
-			'posts' => $this->posts,
-			'categories' => $this->categories,
-			'tags' => $this->tags,
-			'terms' => $this->terms,
-			'base_url' => $this->base_url,
-			'version' => $wxr_version
-		);
-	}
-
-	function get_tag( $string, $tag ) {
-		preg_match( "|<$tag.*?>(.*?)</$tag>|is", $string, $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;
-					}
-				} else {
-					$return = preg_replace( '|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1] );
-				}
-			} else {
-				$return = $return[1];
-			}
-		} else {
-			$return = '';
-		}
-		return $return;
-	}
-
-	function process_category( $c ) {
-		return array(
-			'term_id' => $this->get_tag( $c, 'wp:term_id' ),
-			'cat_name' => $this->get_tag( $c, 'wp:cat_name' ),
-			'category_nicename'	=> $this->get_tag( $c, 'wp:category_nicename' ),
-			'category_parent' => $this->get_tag( $c, 'wp:category_parent' ),
-			'category_description' => $this->get_tag( $c, 'wp:category_description' ),
-		);
-	}
-
-	function process_tag( $t ) {
-		return array(
-			'term_id' => $this->get_tag( $t, 'wp:term_id' ),
-			'tag_name' => $this->get_tag( $t, 'wp:tag_name' ),
-			'tag_slug' => $this->get_tag( $t, 'wp:tag_slug' ),
-			'tag_description' => $this->get_tag( $t, 'wp:tag_description' ),
-		);
-	}
-
-	function process_term( $t ) {
-		return array(
-			'term_id' => $this->get_tag( $t, 'wp:term_id' ),
-			'term_taxonomy' => $this->get_tag( $t, 'wp:term_taxonomy' ),
-			'slug' => $this->get_tag( $t, 'wp:term_slug' ),
-			'term_parent' => $this->get_tag( $t, 'wp:term_parent' ),
-			'term_name' => $this->get_tag( $t, 'wp:term_name' ),
-			'term_description' => $this->get_tag( $t, 'wp:term_description' ),
-		);
-	}
-
-	function process_author( $a ) {
-		return array(
-			'author_id' => $this->get_tag( $a, 'wp:author_id' ),
-			'author_login' => $this->get_tag( $a, 'wp:author_login' ),
-			'author_email' => $this->get_tag( $a, 'wp:author_email' ),
-			'author_display_name' => $this->get_tag( $a, 'wp:author_display_name' ),
-			'author_first_name' => $this->get_tag( $a, 'wp:author_first_name' ),
-			'author_last_name' => $this->get_tag( $a, 'wp:author_last_name' ),
-		);
-	}
-
-	function process_post( $post ) {
-		$post_id        = $this->get_tag( $post, 'wp:post_id' );
-		$post_title     = $this->get_tag( $post, 'title' );
-		$post_date      = $this->get_tag( $post, 'wp:post_date' );
-		$post_date_gmt  = $this->get_tag( $post, 'wp:post_date_gmt' );
-		$comment_status = $this->get_tag( $post, 'wp:comment_status' );
-		$ping_status    = $this->get_tag( $post, 'wp:ping_status' );
-		$status         = $this->get_tag( $post, 'wp:status' );
-		$post_name      = $this->get_tag( $post, 'wp:post_name' );
-		$post_parent    = $this->get_tag( $post, 'wp:post_parent' );
-		$menu_order     = $this->get_tag( $post, 'wp:menu_order' );
-		$post_type      = $this->get_tag( $post, 'wp:post_type' );
-		$post_password  = $this->get_tag( $post, 'wp:post_password' );
-		$is_sticky      = $this->get_tag( $post, 'wp:is_sticky' );
-		$guid           = $this->get_tag( $post, 'guid' );
-		$post_author    = $this->get_tag( $post, 'dc:creator' );
-
-		$post_excerpt = $this->get_tag( $post, 'excerpt:encoded' );
-		$post_excerpt = preg_replace_callback( '|<(/?[A-Z]+)|', array( &$this, '_normalize_tag' ), $post_excerpt );
-		$post_excerpt = str_replace( '<br>', '<br />', $post_excerpt );
-		$post_excerpt = str_replace( '<hr>', '<hr />', $post_excerpt );
-
-		$post_content = $this->get_tag( $post, 'content:encoded' );
-		$post_content = preg_replace_callback( '|<(/?[A-Z]+)|', array( &$this, '_normalize_tag' ), $post_content );
-		$post_content = str_replace( '<br>', '<br />', $post_content );
-		$post_content = str_replace( '<hr>', '<hr />', $post_content );
-
-		$postdata = compact( 'post_id', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_excerpt',
-			'post_title', 'status', 'post_name', 'comment_status', 'ping_status', 'guid', 'post_parent',
-			'menu_order', 'post_type', 'post_password', 'is_sticky'
-		);
-
-		$attachment_url = $this->get_tag( $post, 'wp:attachment_url' );
-		if ( $attachment_url ) {
-					$postdata['attachment_url'] = $attachment_url;
-		}
-
-		preg_match_all( '|<category domain="([^"]+?)" nicename="([^"]+?)">(.+?)</category>|is', $post, $terms, PREG_SET_ORDER );
-		foreach ( $terms as $t ) {
-			$post_terms[] = array(
-				'slug' => $t[2],
-				'domain' => $t[1],
-				'name' => str_replace( array( '<![CDATA[', ']]>' ), '', $t[3] ),
-			);
-		}
-		if ( ! empty( $post_terms ) ) {
-		    $postdata['terms'] = $post_terms;
-		}
-
-		preg_match_all( '|<wp:comment>(.+?)</wp:comment>|is', $post, $comments );
-		$comments = $comments[1];
-		if ( $comments ) {
-			foreach ( $comments as $comment ) {
-				preg_match_all( '|<wp:commentmeta>(.+?)</wp:commentmeta>|is', $comment, $commentmeta );
-				$commentmeta = $commentmeta[1];
-				$c_meta = array();
-				foreach ( $commentmeta as $m ) {
-					$c_meta[] = array(
-						'key' => $this->get_tag( $m, 'wp:meta_key' ),
-						'value' => $this->get_tag( $m, 'wp:meta_value' ),
-					);
-				}
-
-				$post_comments[] = array(
-					'comment_id' => $this->get_tag( $comment, 'wp:comment_id' ),
-					'comment_author' => $this->get_tag( $comment, 'wp:comment_author' ),
-					'comment_author_email' => $this->get_tag( $comment, 'wp:comment_author_email' ),
-					'comment_author_IP' => $this->get_tag( $comment, 'wp:comment_author_IP' ),
-					'comment_author_url' => $this->get_tag( $comment, 'wp:comment_author_url' ),
-					'comment_date' => $this->get_tag( $comment, 'wp:comment_date' ),
-					'comment_date_gmt' => $this->get_tag( $comment, 'wp:comment_date_gmt' ),
-					'comment_content' => $this->get_tag( $comment, 'wp:comment_content' ),
-					'comment_approved' => $this->get_tag( $comment, 'wp:comment_approved' ),
-					'comment_type' => $this->get_tag( $comment, 'wp:comment_type' ),
-					'comment_parent' => $this->get_tag( $comment, 'wp:comment_parent' ),
-					'comment_user_id' => $this->get_tag( $comment, 'wp:comment_user_id' ),
-					'commentmeta' => $c_meta,
-				);
-			}
-		}
-		if ( ! empty( $post_comments ) ) {
-		    $postdata['comments'] = $post_comments;
-		}
-
-		preg_match_all( '|<wp:postmeta>(.+?)</wp:postmeta>|is', $post, $postmeta );
-		$postmeta = $postmeta[1];
-		if ( $postmeta ) {
-			foreach ( $postmeta as $p ) {
-				$post_postmeta[] = array(
-					'key' => $this->get_tag( $p, 'wp:meta_key' ),
-					'value' => $this->get_tag( $p, 'wp:meta_value' ),
-				);
-			}
-		}
-		if ( ! empty( $post_postmeta ) ) {
-		    $postdata['postmeta'] = $post_postmeta;
-		}
-
-		return $postdata;
-	}
-
-	function _normalize_tag( $matches ) {
-		return '<' . strtolower( $matches[1] );
-	}
-
-	function fopen( $filename, $mode = 'r' ) {
-		if ( $this->has_gzip ) {
-					return gzopen( $filename, $mode );
-		}
-		return fopen( $filename, $mode );
-	}
-
-	function feof( $fp ) {
-		if ( $this->has_gzip ) {
-					return gzeof( $fp );
-		}
-		return feof( $fp );
-	}
-
-	function fgets( $fp, $len = 8192 ) {
-		if ( $this->has_gzip ) {
-					return gzgets( $fp, $len );
-		}
-		return fgets( $fp, $len );
-	}
-
-	function fclose( $fp ) {
-		if ( $this->has_gzip ) {
-					return gzclose( $fp );
-		}
-		return fclose( $fp );
-	}
+    var $authors = array();
+    var $posts = array();
+    var $categories = array();
+    var $tags = array();
+    var $terms = array();
+    var $base_url = '';
+
+    function __construct() {
+        $this->has_gzip = is_callable( 'gzopen' );
+    }
+
+    function parse( $file ) {
+        $wxr_version = $in_post = false;
+
+        $fp = $this->fopen( $file, 'r' );
+        if ( $fp ) {
+            while ( ! $this->feof( $fp ) ) {
+                $importline = rtrim( $this->fgets( $fp ) );
+
+                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 );
+                    $this->base_url = $url[1];
+                    continue;
+                }
+                if ( false !== strpos( $importline, '<wp:category>' ) ) {
+                    preg_match( '|<wp:category>(.*?)</wp:category>|is', $importline, $category );
+                    $this->categories[] = $this->process_category( $category[1] );
+                    continue;
+                }
+                if ( false !== strpos( $importline, '<wp:tag>' ) ) {
+                    preg_match( '|<wp:tag>(.*?)</wp:tag>|is', $importline, $tag );
+                    $this->tags[] = $this->process_tag( $tag[1] );
+                    continue;
+                }
+                if ( false !== strpos( $importline, '<wp:term>' ) ) {
+                    preg_match( '|<wp:term>(.*?)</wp:term>|is', $importline, $term );
+                    $this->terms[] = $this->process_term( $term[1] );
+                    continue;
+                }
+                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;
+                    continue;
+                }
+                if ( false !== strpos( $importline, '<item>' ) ) {
+                    $post = '';
+                    $in_post = true;
+                    continue;
+                }
+                if ( false !== strpos( $importline, '</item>' ) ) {
+                    $in_post = false;
+                    $this->posts[] = $this->process_post( $post );
+                    continue;
+                }
+                if ( $in_post ) {
+                    $post .= $importline . "\n";
+                }
+            }
+
+            $this->fclose($fp);
+        }
+
+        if ( ! $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(
+            'authors' => $this->authors,
+            'posts' => $this->posts,
+            'categories' => $this->categories,
+            'tags' => $this->tags,
+            'terms' => $this->terms,
+            'base_url' => $this->base_url,
+            'version' => $wxr_version
+        );
+    }
+
+    function get_tag( $string, $tag ) {
+        preg_match( "|<$tag.*?>(.*?)</$tag>|is", $string, $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;
+                    }
+                } else {
+                    $return = preg_replace( '|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1] );
+                }
+            } else {
+                $return = $return[1];
+            }
+        } else {
+            $return = '';
+        }
+        return $return;
+    }
+
+    function process_category( $c ) {
+        return array(
+            'term_id' => $this->get_tag( $c, 'wp:term_id' ),
+            'cat_name' => $this->get_tag( $c, 'wp:cat_name' ),
+            'category_nicename'	=> $this->get_tag( $c, 'wp:category_nicename' ),
+            'category_parent' => $this->get_tag( $c, 'wp:category_parent' ),
+            'category_description' => $this->get_tag( $c, 'wp:category_description' ),
+        );
+    }
+
+    function process_tag( $t ) {
+        return array(
+            'term_id' => $this->get_tag( $t, 'wp:term_id' ),
+            'tag_name' => $this->get_tag( $t, 'wp:tag_name' ),
+            'tag_slug' => $this->get_tag( $t, 'wp:tag_slug' ),
+            'tag_description' => $this->get_tag( $t, 'wp:tag_description' ),
+        );
+    }
+
+    function process_term( $t ) {
+        return array(
+            'term_id' => $this->get_tag( $t, 'wp:term_id' ),
+            'term_taxonomy' => $this->get_tag( $t, 'wp:term_taxonomy' ),
+            'slug' => $this->get_tag( $t, 'wp:term_slug' ),
+            'term_parent' => $this->get_tag( $t, 'wp:term_parent' ),
+            'term_name' => $this->get_tag( $t, 'wp:term_name' ),
+            'term_description' => $this->get_tag( $t, 'wp:term_description' ),
+        );
+    }
+
+    function process_author( $a ) {
+        return array(
+            'author_id' => $this->get_tag( $a, 'wp:author_id' ),
+            'author_login' => $this->get_tag( $a, 'wp:author_login' ),
+            'author_email' => $this->get_tag( $a, 'wp:author_email' ),
+            'author_display_name' => $this->get_tag( $a, 'wp:author_display_name' ),
+            'author_first_name' => $this->get_tag( $a, 'wp:author_first_name' ),
+            'author_last_name' => $this->get_tag( $a, 'wp:author_last_name' ),
+        );
+    }
+
+    function process_post( $post ) {
+        $post_id        = $this->get_tag( $post, 'wp:post_id' );
+        $post_title     = $this->get_tag( $post, 'title' );
+        $post_date      = $this->get_tag( $post, 'wp:post_date' );
+        $post_date_gmt  = $this->get_tag( $post, 'wp:post_date_gmt' );
+        $comment_status = $this->get_tag( $post, 'wp:comment_status' );
+        $ping_status    = $this->get_tag( $post, 'wp:ping_status' );
+        $status         = $this->get_tag( $post, 'wp:status' );
+        $post_name      = $this->get_tag( $post, 'wp:post_name' );
+        $post_parent    = $this->get_tag( $post, 'wp:post_parent' );
+        $menu_order     = $this->get_tag( $post, 'wp:menu_order' );
+        $post_type      = $this->get_tag( $post, 'wp:post_type' );
+        $post_password  = $this->get_tag( $post, 'wp:post_password' );
+        $is_sticky      = $this->get_tag( $post, 'wp:is_sticky' );
+        $guid           = $this->get_tag( $post, 'guid' );
+        $post_author    = $this->get_tag( $post, 'dc:creator' );
+
+        $post_excerpt = $this->get_tag( $post, 'excerpt:encoded' );
+        $post_excerpt = preg_replace_callback( '|<(/?[A-Z]+)|', array( &$this, '_normalize_tag' ), $post_excerpt );
+        $post_excerpt = str_replace( '<br>', '<br />', $post_excerpt );
+        $post_excerpt = str_replace( '<hr>', '<hr />', $post_excerpt );
+
+        $post_content = $this->get_tag( $post, 'content:encoded' );
+        $post_content = preg_replace_callback( '|<(/?[A-Z]+)|', array( &$this, '_normalize_tag' ), $post_content );
+        $post_content = str_replace( '<br>', '<br />', $post_content );
+        $post_content = str_replace( '<hr>', '<hr />', $post_content );
+
+        $postdata = compact( 'post_id', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_excerpt',
+            'post_title', 'status', 'post_name', 'comment_status', 'ping_status', 'guid', 'post_parent',
+            'menu_order', 'post_type', 'post_password', 'is_sticky'
+        );
+
+        $attachment_url = $this->get_tag( $post, 'wp:attachment_url' );
+        if ( $attachment_url ) {
+                    $postdata['attachment_url'] = $attachment_url;
+        }
+
+        preg_match_all( '|<category domain="([^"]+?)" nicename="([^"]+?)">(.+?)</category>|is', $post, $terms, PREG_SET_ORDER );
+        foreach ( $terms as $t ) {
+            $post_terms[] = array(
+                'slug' => $t[2],
+                'domain' => $t[1],
+                'name' => str_replace( array( '<![CDATA[', ']]>' ), '', $t[3] ),
+            );
+        }
+        if ( ! empty( $post_terms ) ) {
+            $postdata['terms'] = $post_terms;
+        }
+
+        preg_match_all( '|<wp:comment>(.+?)</wp:comment>|is', $post, $comments );
+        $comments = $comments[1];
+        if ( $comments ) {
+            foreach ( $comments as $comment ) {
+                preg_match_all( '|<wp:commentmeta>(.+?)</wp:commentmeta>|is', $comment, $commentmeta );
+                $commentmeta = $commentmeta[1];
+                $c_meta = array();
+                foreach ( $commentmeta as $m ) {
+                    $c_meta[] = array(
+                        'key' => $this->get_tag( $m, 'wp:meta_key' ),
+                        'value' => $this->get_tag( $m, 'wp:meta_value' ),
+                    );
+                }
+
+                $post_comments[] = array(
+                    'comment_id' => $this->get_tag( $comment, 'wp:comment_id' ),
+                    'comment_author' => $this->get_tag( $comment, 'wp:comment_author' ),
+                    'comment_author_email' => $this->get_tag( $comment, 'wp:comment_author_email' ),
+                    'comment_author_IP' => $this->get_tag( $comment, 'wp:comment_author_IP' ),
+                    'comment_author_url' => $this->get_tag( $comment, 'wp:comment_author_url' ),
+                    'comment_date' => $this->get_tag( $comment, 'wp:comment_date' ),
+                    'comment_date_gmt' => $this->get_tag( $comment, 'wp:comment_date_gmt' ),
+                    'comment_content' => $this->get_tag( $comment, 'wp:comment_content' ),
+                    'comment_approved' => $this->get_tag( $comment, 'wp:comment_approved' ),
+                    'comment_type' => $this->get_tag( $comment, 'wp:comment_type' ),
+                    'comment_parent' => $this->get_tag( $comment, 'wp:comment_parent' ),
+                    'comment_user_id' => $this->get_tag( $comment, 'wp:comment_user_id' ),
+                    'commentmeta' => $c_meta,
+                );
+            }
+        }
+        if ( ! empty( $post_comments ) ) {
+            $postdata['comments'] = $post_comments;
+        }
+
+        preg_match_all( '|<wp:postmeta>(.+?)</wp:postmeta>|is', $post, $postmeta );
+        $postmeta = $postmeta[1];
+        if ( $postmeta ) {
+            foreach ( $postmeta as $p ) {
+                $post_postmeta[] = array(
+                    'key' => $this->get_tag( $p, 'wp:meta_key' ),
+                    'value' => $this->get_tag( $p, 'wp:meta_value' ),
+                );
+            }
+        }
+        if ( ! empty( $post_postmeta ) ) {
+            $postdata['postmeta'] = $post_postmeta;
+        }
+
+        return $postdata;
+    }
+
+    function _normalize_tag( $matches ) {
+        return '<' . strtolower( $matches[1] );
+    }
+
+    function fopen( $filename, $mode = 'r' ) {
+        if ( $this->has_gzip ) {
+                    return gzopen( $filename, $mode );
+        }
+        return fopen( $filename, $mode );
+    }
+
+    function feof( $fp ) {
+        if ( $this->has_gzip ) {
+                    return gzeof( $fp );
+        }
+        return feof( $fp );
+    }
+
+    function fgets( $fp, $len = 8192 ) {
+        if ( $this->has_gzip ) {
+                    return gzgets( $fp, $len );
+        }
+        return fgets( $fp, $len );
+    }
+
+    function fclose( $fp ) {
+        if ( $this->has_gzip ) {
+                    return gzclose( $fp );
+        }
+        return fclose( $fp );
+    }
 }

Spacing +239 added lines, -239 removed lines

@@ -10,45 +10,45 @@ 
  * WordPress Importer class for managing parsing of WXR files.
  */
 class WXR_Parser {
-	function parse( $file ) {
+	function parse($file) {
 		// Attempt to use proper XML parsers first
-		if ( extension_loaded( 'simplexml' ) ) {
+		if (extension_loaded('simplexml')) {
 			$parser = new WXR_Parser_SimpleXML;
-			$result = $parser->parse( $file );
+			$result = $parser->parse($file);
 
 			// If SimpleXML succeeds or this is an invalid WXR file then return the results
-			if ( ! is_wp_error( $result ) || 'SimpleXML_parse_error' != $result->get_error_code() ) {
+			if ( ! is_wp_error($result) || 'SimpleXML_parse_error' != $result->get_error_code()) {
 							return $result;
 			}
-		} else if ( extension_loaded( 'xml' ) ) {
+		} else if (extension_loaded('xml')) {
 			$parser = new WXR_Parser_XML;
-			$result = $parser->parse( $file );
+			$result = $parser->parse($file);
 
 			// If XMLParser succeeds or this is an invalid WXR file then return the results
-			if ( ! is_wp_error( $result ) || 'XML_parse_error' != $result->get_error_code() ) {
+			if ( ! is_wp_error($result) || 'XML_parse_error' != $result->get_error_code()) {
 							return $result;
 			}
 		}
 
 		// We have a malformed XML file, so display the error and fallthrough to regex
-		if ( isset($result) && defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+		if (isset($result) && defined('IMPORT_DEBUG') && IMPORT_DEBUG) {
 			echo '<pre>';
-			if ( 'SimpleXML_parse_error' == $result->get_error_code() ) {
-				foreach  ( $result->get_error_data() as $error ) {
-									echo $error->line . ':' . $error->column . ' ' . esc_html( $error->message ) . "\n";
+			if ('SimpleXML_parse_error' == $result->get_error_code()) {
+				foreach ($result->get_error_data() as $error) {
+									echo $error->line . ':' . $error->column . ' ' . esc_html($error->message) . "\n";
 				}
-			} else if ( 'XML_parse_error' == $result->get_error_code() ) {
+			} else if ('XML_parse_error' == $result->get_error_code()) {
 				$error = $result->get_error_data();
-				echo $error[0] . ':' . $error[1] . ' ' . esc_html( $error[2] );
+				echo $error[0] . ':' . $error[1] . ' ' . esc_html($error[2]);
 			}
 			echo '</pre>';
-			echo '<p><strong>' . __( 'There was an error when reading this WXR file', 'wordpress-importer' ) . '</strong><br />';
-			echo __( 'Details are shown above. The importer will now try again with a different parser...', 'wordpress-importer' ) . '</p>';
+			echo '<p><strong>' . __('There was an error when reading this WXR file', 'wordpress-importer') . '</strong><br />';
+			echo __('Details are shown above. The importer will now try again with a different parser...', 'wordpress-importer') . '</p>';
 		}
 
 		// use regular expressions if nothing else available or this is bad XML
 		$parser = new WXR_Parser_Regex;
-		return $parser->parse( $file );
+		return $parser->parse($file);
 	}
 }
 
@@ -56,58 +56,58 @@ 
  * WXR Parser that makes use of the SimpleXML PHP extension.
  */
 class WXR_Parser_SimpleXML {
-	function parse( $file ) {
+	function parse($file) {
 		$authors = $posts = $categories = $tags = $terms = array();
 
 		$internal_errors = libxml_use_internal_errors(true);
 
 		$dom = new DOMDocument;
 		$old_value = null;
-		if ( function_exists( 'libxml_disable_entity_loader' ) ) {
-			$old_value = libxml_disable_entity_loader( true );
+		if (function_exists('libxml_disable_entity_loader')) {
+			$old_value = libxml_disable_entity_loader(true);
 		}
-		$success = $dom->loadXML( file_get_contents( $file ) );
-		if ( ! is_null( $old_value ) ) {
-			libxml_disable_entity_loader( $old_value );
+		$success = $dom->loadXML(file_get_contents($file));
+		if ( ! is_null($old_value)) {
+			libxml_disable_entity_loader($old_value);
 		}
 
-		if ( ! $success || isset( $dom->doctype ) ) {
-			return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this WXR file', 'wordpress-importer' ), libxml_get_errors() );
+		if ( ! $success || isset($dom->doctype)) {
+			return new WP_Error('SimpleXML_parse_error', __('There was an error when reading this WXR file', 'wordpress-importer'), libxml_get_errors());
 		}
 
-		$xml = simplexml_import_dom( $dom );
-		unset( $dom );
+		$xml = simplexml_import_dom($dom);
+		unset($dom);
 
 		// halt if loading produces an error
-		if ( ! $xml ) {
-					return new WP_Error( 'SimpleXML_parse_error', __( 'There was an error when reading this WXR file', 'wordpress-importer' ), libxml_get_errors() );
+		if ( ! $xml) {
+					return new WP_Error('SimpleXML_parse_error', __('There was an error when reading this WXR file', 'wordpress-importer'), libxml_get_errors());
 		}
 
 		$wxr_version = $xml->xpath('/rss/channel/wp:wxr_version');
-		if ( ! $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' ) );
+		if ( ! $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'));
 		}
 
-		$wxr_version = (string) trim( $wxr_version[0] );
+		$wxr_version = (string) trim($wxr_version[0]);
 		// confirm that we are dealing with the correct file format
-		if ( ! preg_match( '/^\d+\.\d+$/', $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' ) );
+		if ( ! preg_match('/^\d+\.\d+$/', $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'));
 		}
 
 		$base_url = $xml->xpath('/rss/channel/wp:base_site_url');
-		$base_url = (string) trim( $base_url[0] );
+		$base_url = (string) trim($base_url[0]);
 
 		$namespaces = $xml->getDocNamespaces();
-		if ( ! isset( $namespaces['wp'] ) ) {
+		if ( ! isset($namespaces['wp'])) {
 					$namespaces['wp'] = 'http://wordpress.org/export/1.1/';
 		}
-		if ( ! isset( $namespaces['excerpt'] ) ) {
+		if ( ! isset($namespaces['excerpt'])) {
 					$namespaces['excerpt'] = 'http://wordpress.org/export/1.1/excerpt/';
 		}
 
 		// grab authors
-		foreach ( $xml->xpath('/rss/channel/wp:author') as $author_arr ) {
-			$a = $author_arr->children( $namespaces['wp'] );
+		foreach ($xml->xpath('/rss/channel/wp:author') as $author_arr) {
+			$a = $author_arr->children($namespaces['wp']);
 			$login = (string) $a->author_login;
 			$authors[$login] = array(
 				'author_id' => (int) $a->author_id,
@@ -120,8 +120,8 @@ 
 		}
 
 		// grab cats, tags and terms
-		foreach ( $xml->xpath('/rss/channel/wp:category') as $term_arr ) {
-			$t = $term_arr->children( $namespaces['wp'] );
+		foreach ($xml->xpath('/rss/channel/wp:category') as $term_arr) {
+			$t = $term_arr->children($namespaces['wp']);
 			$category = array(
 				'term_id' => (int) $t->term_id,
 				'category_nicename' => (string) $t->category_nicename,
@@ -130,7 +130,7 @@ 
 				'category_description' => (string) $t->category_description
 			);
 
-			foreach ( $t->termmeta as $meta ) {
+			foreach ($t->termmeta as $meta) {
 				$category['termmeta'][] = array(
 					'key' => (string) $meta->meta_key,
 					'value' => (string) $meta->meta_value
@@ -140,8 +140,8 @@ 
 			$categories[] = $category;
 		}
 
-		foreach ( $xml->xpath('/rss/channel/wp:tag') as $term_arr ) {
-			$t = $term_arr->children( $namespaces['wp'] );
+		foreach ($xml->xpath('/rss/channel/wp:tag') as $term_arr) {
+			$t = $term_arr->children($namespaces['wp']);
 			$tag = array(
 				'term_id' => (int) $t->term_id,
 				'tag_slug' => (string) $t->tag_slug,
@@ -149,7 +149,7 @@ 
 				'tag_description' => (string) $t->tag_description
 			);
 
-			foreach ( $t->termmeta as $meta ) {
+			foreach ($t->termmeta as $meta) {
 				$tag['termmeta'][] = array(
 					'key' => (string) $meta->meta_key,
 					'value' => (string) $meta->meta_value
@@ -159,8 +159,8 @@ 
 			$tags[] = $tag;
 		}
 
-		foreach ( $xml->xpath('/rss/channel/wp:term') as $term_arr ) {
-			$t = $term_arr->children( $namespaces['wp'] );
+		foreach ($xml->xpath('/rss/channel/wp:term') as $term_arr) {
+			$t = $term_arr->children($namespaces['wp']);
 			$term = array(
 				'term_id' => (int) $t->term_id,
 				'term_taxonomy' => (string) $t->term_taxonomy,
@@ -170,7 +170,7 @@ 
 				'term_description' => (string) $t->term_description
 			);
 
-			foreach ( $t->termmeta as $meta ) {
+			foreach ($t->termmeta as $meta) {
 				$term['termmeta'][] = array(
 					'key' => (string) $meta->meta_key,
 					'value' => (string) $meta->meta_value
@@ -181,21 +181,21 @@ 
 		}
 
 		// grab posts
-		foreach ( $xml->channel->item as $item ) {
+		foreach ($xml->channel->item as $item) {
 			$post = array(
 				'post_title' => (string) $item->title,
 				'guid' => (string) $item->guid,
 			);
 
-			$dc = $item->children( 'http://purl.org/dc/elements/1.1/' );
+			$dc = $item->children('http://purl.org/dc/elements/1.1/');
 			$post['post_author'] = (string) $dc->creator;
 
-			$content = $item->children( 'http://purl.org/rss/1.0/modules/content/' );
-			$excerpt = $item->children( $namespaces['excerpt'] );
+			$content = $item->children('http://purl.org/rss/1.0/modules/content/');
+			$excerpt = $item->children($namespaces['excerpt']);
 			$post['post_content'] = (string) $content->encoded;
 			$post['post_excerpt'] = (string) $excerpt->encoded;
 
-			$wp = $item->children( $namespaces['wp'] );
+			$wp = $item->children($namespaces['wp']);
 			$post['post_id'] = (int) $wp->post_id;
 			$post['post_date'] = (string) $wp->post_date;
 			$post['post_date_gmt'] = (string) $wp->post_date_gmt;
@@ -209,13 +209,13 @@ 
 			$post['post_password'] = (string) $wp->post_password;
 			$post['is_sticky'] = (int) $wp->is_sticky;
 
-			if ( isset($wp->attachment_url) ) {
+			if (isset($wp->attachment_url)) {
 							$post['attachment_url'] = (string) $wp->attachment_url;
 			}
 
-			foreach ( $item->category as $c ) {
+			foreach ($item->category as $c) {
 				$att = $c->attributes();
-				if ( isset( $att['nicename'] ) ) {
+				if (isset($att['nicename'])) {
 									$post['terms'][] = array(
 						'name' => (string) $c,
 						'slug' => (string) $att['nicename'],
@@ -224,17 +224,17 @@ 
 				}
 			}
 
-			foreach ( $wp->postmeta as $meta ) {
+			foreach ($wp->postmeta as $meta) {
 				$post['postmeta'][] = array(
 					'key' => (string) $meta->meta_key,
 					'value' => (string) $meta->meta_value
 				);
 			}
 
-			foreach ( $wp->comment as $comment ) {
+			foreach ($wp->comment as $comment) {
 				$meta = array();
-				if ( isset( $comment->commentmeta ) ) {
-					foreach ( $comment->commentmeta as $m ) {
+				if (isset($comment->commentmeta)) {
+					foreach ($comment->commentmeta as $m) {
 						$meta[] = array(
 							'key' => (string) $m->meta_key,
 							'value' => (string) $m->meta_value
@@ -288,32 +288,32 @@ 
 	);
 	var $wp_sub_tags = array(
 		'wp:comment_id', 'wp:comment_author', 'wp:comment_author_email', 'wp:comment_author_url',
-		'wp:comment_author_IP',	'wp:comment_date', 'wp:comment_date_gmt', 'wp:comment_content',
+		'wp:comment_author_IP', 'wp:comment_date', 'wp:comment_date_gmt', 'wp:comment_content',
 		'wp:comment_approved', 'wp:comment_type', 'wp:comment_parent', 'wp:comment_user_id',
 	);
 
-	function parse( $file ) {
+	function parse($file) {
 		$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' );
-		xml_parser_set_option( $xml, XML_OPTION_SKIP_WHITE, 1 );
-		xml_parser_set_option( $xml, XML_OPTION_CASE_FOLDING, 0 );
-		xml_set_object( $xml, $this );
-		xml_set_character_data_handler( $xml, 'cdata' );
-		xml_set_element_handler( $xml, 'tag_open', 'tag_close' );
+		$xml = xml_parser_create('UTF-8');
+		xml_parser_set_option($xml, XML_OPTION_SKIP_WHITE, 1);
+		xml_parser_set_option($xml, XML_OPTION_CASE_FOLDING, 0);
+		xml_set_object($xml, $this);
+		xml_set_character_data_handler($xml, 'cdata');
+		xml_set_element_handler($xml, 'tag_open', 'tag_close');
 
-		if ( ! xml_parse( $xml, file_get_contents( $file ), true ) ) {
-			$current_line = xml_get_current_line_number( $xml );
-			$current_column = xml_get_current_column_number( $xml );
-			$error_code = xml_get_error_code( $xml );
-			$error_string = xml_error_string( $error_code );
-			return new WP_Error( 'XML_parse_error', 'There was an error when reading this WXR file', array( $current_line, $current_column, $error_string ) );
+		if ( ! xml_parse($xml, file_get_contents($file), true)) {
+			$current_line = xml_get_current_line_number($xml);
+			$current_column = xml_get_current_column_number($xml);
+			$error_code = xml_get_error_code($xml);
+			$error_string = xml_error_string($error_code);
+			return new WP_Error('XML_parse_error', 'There was an error when reading this WXR file', array($current_line, $current_column, $error_string));
 		}
-		xml_parser_free( $xml );
+		xml_parser_free($xml);
 
-		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' ) );
+		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(
@@ -327,26 +327,26 @@ 
 		);
 	}
 
-	function tag_open( $parse, $tag, $attr ) {
-		if ( in_array( $tag, $this->wp_tags ) ) {
-			$this->in_tag = substr( $tag, 3 );
+	function tag_open($parse, $tag, $attr) {
+		if (in_array($tag, $this->wp_tags)) {
+			$this->in_tag = substr($tag, 3);
 			return;
 		}
 
-		if ( in_array( $tag, $this->wp_sub_tags ) ) {
-			$this->in_sub_tag = substr( $tag, 3 );
+		if (in_array($tag, $this->wp_sub_tags)) {
+			$this->in_sub_tag = substr($tag, 3);
 			return;
 		}
 
-		switch ( $tag ) {
+		switch ($tag) {
 			case 'category':
-				if ( isset($attr['domain'], $attr['nicename']) ) {
+				if (isset($attr['domain'], $attr['nicename'])) {
 					$this->sub_data['domain'] = $attr['domain'];
 					$this->sub_data['slug'] = $attr['nicename'];
 				}
 				break;
 			case 'item': $this->in_post = true;
-			case 'title': if ( $this->in_post ) {
+			case 'title': if ($this->in_post) {
 			    $this->in_tag = 'post_title';
 			}
 			break;
@@ -361,23 +361,23 @@ 
 		}
 	}
 
-	function cdata( $parser, $cdata ) {
-		if ( ! trim( $cdata ) ) {
+	function cdata($parser, $cdata) {
+		if ( ! trim($cdata)) {
 					return;
 		}
 
-		if ( false !== $this->in_tag || false !== $this->in_sub_tag ) {
+		if (false !== $this->in_tag || false !== $this->in_sub_tag) {
 			$this->cdata .= $cdata;
 		} else {
-			$this->cdata .= trim( $cdata );
+			$this->cdata .= trim($cdata);
 		}
 	}
 
-	function tag_close( $parser, $tag ) {
-		switch ( $tag ) {
+	function tag_close($parser, $tag) {
+		switch ($tag) {
 			case 'wp:comment':
-				unset( $this->sub_data['key'], $this->sub_data['value'] ); // remove meta sub_data
-				if ( ! empty( $this->sub_data ) ) {
+				unset($this->sub_data['key'], $this->sub_data['value']); // remove meta sub_data
+				if ( ! empty($this->sub_data)) {
 									$this->data['comments'][] = $this->sub_data;
 				}
 				$this->sub_data = false;
@@ -389,14 +389,14 @@ 
 				);
 				break;
 			case 'category':
-				if ( ! empty( $this->sub_data ) ) {
+				if ( ! empty($this->sub_data)) {
 					$this->sub_data['name'] = $this->cdata;
 					$this->data['terms'][] = $this->sub_data;
 				}
 				$this->sub_data = false;
 				break;
 			case 'wp:postmeta':
-				if ( ! empty( $this->sub_data ) ) {
+				if ( ! empty($this->sub_data)) {
 									$this->data['postmeta'][] = $this->sub_data;
 				}
 				$this->sub_data = false;
@@ -408,12 +408,12 @@ 
 			case 'wp:category':
 			case 'wp:tag':
 			case 'wp:term':
-				$n = substr( $tag, 3 );
-				array_push( $this->$n, $this->data );
+				$n = substr($tag, 3);
+				array_push($this->$n, $this->data);
 				$this->data = false;
 				break;
 			case 'wp:author':
-				if ( ! empty($this->data['author_login']) ) {
+				if ( ! empty($this->data['author_login'])) {
 									$this->authors[$this->data['author_login']] = $this->data;
 				}
 				$this->data = false;
@@ -426,11 +426,11 @@ 
 				break;
 
 			default:
-				if ( $this->in_sub_tag ) {
-					$this->sub_data[$this->in_sub_tag] = ! empty( $this->cdata ) ? $this->cdata : '';
+				if ($this->in_sub_tag) {
+					$this->sub_data[$this->in_sub_tag] = ! empty($this->cdata) ? $this->cdata : '';
 					$this->in_sub_tag = false;
-				} else if ( $this->in_tag ) {
-					$this->data[$this->in_tag] = ! empty( $this->cdata ) ? $this->cdata : '';
+				} else if ($this->in_tag) {
+					$this->data[$this->in_tag] = ! empty($this->cdata) ? $this->cdata : '';
 					$this->in_tag = false;
 				}
 		}
@@ -451,58 +451,58 @@ 
 	var $base_url = '';
 
 	function __construct() {
-		$this->has_gzip = is_callable( 'gzopen' );
+		$this->has_gzip = is_callable('gzopen');
 	}
 
-	function parse( $file ) {
+	function parse($file) {
 		$wxr_version = $in_post = false;
 
-		$fp = $this->fopen( $file, 'r' );
-		if ( $fp ) {
-			while ( ! $this->feof( $fp ) ) {
-				$importline = rtrim( $this->fgets( $fp ) );
+		$fp = $this->fopen($file, 'r');
+		if ($fp) {
+			while ( ! $this->feof($fp)) {
+				$importline = rtrim($this->fgets($fp));
 
-				if ( ! $wxr_version && preg_match( '|<wp:wxr_version>(\d+\.\d+)</wp:wxr_version>|', $importline, $version ) ) {
+				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 );
+				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];
 					continue;
 				}
-				if ( false !== strpos( $importline, '<wp:category>' ) ) {
-					preg_match( '|<wp:category>(.*?)</wp:category>|is', $importline, $category );
-					$this->categories[] = $this->process_category( $category[1] );
+				if (false !== strpos($importline, '<wp:category>')) {
+					preg_match('|<wp:category>(.*?)</wp:category>|is', $importline, $category);
+					$this->categories[] = $this->process_category($category[1]);
 					continue;
 				}
-				if ( false !== strpos( $importline, '<wp:tag>' ) ) {
-					preg_match( '|<wp:tag>(.*?)</wp:tag>|is', $importline, $tag );
-					$this->tags[] = $this->process_tag( $tag[1] );
+				if (false !== strpos($importline, '<wp:tag>')) {
+					preg_match('|<wp:tag>(.*?)</wp:tag>|is', $importline, $tag);
+					$this->tags[] = $this->process_tag($tag[1]);
 					continue;
 				}
-				if ( false !== strpos( $importline, '<wp:term>' ) ) {
-					preg_match( '|<wp:term>(.*?)</wp:term>|is', $importline, $term );
-					$this->terms[] = $this->process_term( $term[1] );
+				if (false !== strpos($importline, '<wp:term>')) {
+					preg_match('|<wp:term>(.*?)</wp:term>|is', $importline, $term);
+					$this->terms[] = $this->process_term($term[1]);
 					continue;
 				}
-				if ( false !== strpos( $importline, '<wp:author>' ) ) {
-					preg_match( '|<wp:author>(.*?)</wp:author>|is', $importline, $author );
-					$a = $this->process_author( $author[1] );
+				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;
 					continue;
 				}
-				if ( false !== strpos( $importline, '<item>' ) ) {
+				if (false !== strpos($importline, '<item>')) {
 					$post = '';
 					$in_post = true;
 					continue;
 				}
-				if ( false !== strpos( $importline, '</item>' ) ) {
+				if (false !== strpos($importline, '</item>')) {
 					$in_post = false;
-					$this->posts[] = $this->process_post( $post );
+					$this->posts[] = $this->process_post($post);
 					continue;
 				}
-				if ( $in_post ) {
+				if ($in_post) {
 					$post .= $importline . "\n";
 				}
 			}
@@ -510,8 +510,8 @@ 
 			$this->fclose($fp);
 		}
 
-		if ( ! $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' ) );
+		if ( ! $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(
@@ -525,18 +525,18 @@ 
 		);
 	}
 
-	function get_tag( $string, $tag ) {
-		preg_match( "|<$tag.*?>(.*?)</$tag>|is", $string, $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 );
+	function get_tag($string, $tag) {
+		preg_match("|<$tag.*?>(.*?)</$tag>|is", $string, $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 ) {
+					foreach ($matches[1] as $match) {
 											$return .= $match;
 					}
 				} else {
-					$return = preg_replace( '|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1] );
+					$return = preg_replace('|^<!\[CDATA\[(.*)\]\]>$|s', '$1', $return[1]);
 				}
 			} else {
 				$return = $return[1];
@@ -547,177 +547,177 @@ 
 		return $return;
 	}
 
-	function process_category( $c ) {
+	function process_category($c) {
 		return array(
-			'term_id' => $this->get_tag( $c, 'wp:term_id' ),
-			'cat_name' => $this->get_tag( $c, 'wp:cat_name' ),
-			'category_nicename'	=> $this->get_tag( $c, 'wp:category_nicename' ),
-			'category_parent' => $this->get_tag( $c, 'wp:category_parent' ),
-			'category_description' => $this->get_tag( $c, 'wp:category_description' ),
+			'term_id' => $this->get_tag($c, 'wp:term_id'),
+			'cat_name' => $this->get_tag($c, 'wp:cat_name'),
+			'category_nicename'	=> $this->get_tag($c, 'wp:category_nicename'),
+			'category_parent' => $this->get_tag($c, 'wp:category_parent'),
+			'category_description' => $this->get_tag($c, 'wp:category_description'),
 		);
 	}
 
-	function process_tag( $t ) {
+	function process_tag($t) {
 		return array(
-			'term_id' => $this->get_tag( $t, 'wp:term_id' ),
-			'tag_name' => $this->get_tag( $t, 'wp:tag_name' ),
-			'tag_slug' => $this->get_tag( $t, 'wp:tag_slug' ),
-			'tag_description' => $this->get_tag( $t, 'wp:tag_description' ),
+			'term_id' => $this->get_tag($t, 'wp:term_id'),
+			'tag_name' => $this->get_tag($t, 'wp:tag_name'),
+			'tag_slug' => $this->get_tag($t, 'wp:tag_slug'),
+			'tag_description' => $this->get_tag($t, 'wp:tag_description'),
 		);
 	}
 
-	function process_term( $t ) {
+	function process_term($t) {
 		return array(
-			'term_id' => $this->get_tag( $t, 'wp:term_id' ),
-			'term_taxonomy' => $this->get_tag( $t, 'wp:term_taxonomy' ),
-			'slug' => $this->get_tag( $t, 'wp:term_slug' ),
-			'term_parent' => $this->get_tag( $t, 'wp:term_parent' ),
-			'term_name' => $this->get_tag( $t, 'wp:term_name' ),
-			'term_description' => $this->get_tag( $t, 'wp:term_description' ),
+			'term_id' => $this->get_tag($t, 'wp:term_id'),
+			'term_taxonomy' => $this->get_tag($t, 'wp:term_taxonomy'),
+			'slug' => $this->get_tag($t, 'wp:term_slug'),
+			'term_parent' => $this->get_tag($t, 'wp:term_parent'),
+			'term_name' => $this->get_tag($t, 'wp:term_name'),
+			'term_description' => $this->get_tag($t, 'wp:term_description'),
 		);
 	}
 
-	function process_author( $a ) {
+	function process_author($a) {
 		return array(
-			'author_id' => $this->get_tag( $a, 'wp:author_id' ),
-			'author_login' => $this->get_tag( $a, 'wp:author_login' ),
-			'author_email' => $this->get_tag( $a, 'wp:author_email' ),
-			'author_display_name' => $this->get_tag( $a, 'wp:author_display_name' ),
-			'author_first_name' => $this->get_tag( $a, 'wp:author_first_name' ),
-			'author_last_name' => $this->get_tag( $a, 'wp:author_last_name' ),
+			'author_id' => $this->get_tag($a, 'wp:author_id'),
+			'author_login' => $this->get_tag($a, 'wp:author_login'),
+			'author_email' => $this->get_tag($a, 'wp:author_email'),
+			'author_display_name' => $this->get_tag($a, 'wp:author_display_name'),
+			'author_first_name' => $this->get_tag($a, 'wp:author_first_name'),
+			'author_last_name' => $this->get_tag($a, 'wp:author_last_name'),
 		);
 	}
 
-	function process_post( $post ) {
-		$post_id        = $this->get_tag( $post, 'wp:post_id' );
-		$post_title     = $this->get_tag( $post, 'title' );
-		$post_date      = $this->get_tag( $post, 'wp:post_date' );
-		$post_date_gmt  = $this->get_tag( $post, 'wp:post_date_gmt' );
-		$comment_status = $this->get_tag( $post, 'wp:comment_status' );
-		$ping_status    = $this->get_tag( $post, 'wp:ping_status' );
-		$status         = $this->get_tag( $post, 'wp:status' );
-		$post_name      = $this->get_tag( $post, 'wp:post_name' );
-		$post_parent    = $this->get_tag( $post, 'wp:post_parent' );
-		$menu_order     = $this->get_tag( $post, 'wp:menu_order' );
-		$post_type      = $this->get_tag( $post, 'wp:post_type' );
-		$post_password  = $this->get_tag( $post, 'wp:post_password' );
-		$is_sticky      = $this->get_tag( $post, 'wp:is_sticky' );
-		$guid           = $this->get_tag( $post, 'guid' );
-		$post_author    = $this->get_tag( $post, 'dc:creator' );
-
-		$post_excerpt = $this->get_tag( $post, 'excerpt:encoded' );
-		$post_excerpt = preg_replace_callback( '|<(/?[A-Z]+)|', array( &$this, '_normalize_tag' ), $post_excerpt );
-		$post_excerpt = str_replace( '<br>', '<br />', $post_excerpt );
-		$post_excerpt = str_replace( '<hr>', '<hr />', $post_excerpt );
-
-		$post_content = $this->get_tag( $post, 'content:encoded' );
-		$post_content = preg_replace_callback( '|<(/?[A-Z]+)|', array( &$this, '_normalize_tag' ), $post_content );
-		$post_content = str_replace( '<br>', '<br />', $post_content );
-		$post_content = str_replace( '<hr>', '<hr />', $post_content );
-
-		$postdata = compact( 'post_id', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_excerpt',
+	function process_post($post) {
+		$post_id        = $this->get_tag($post, 'wp:post_id');
+		$post_title     = $this->get_tag($post, 'title');
+		$post_date      = $this->get_tag($post, 'wp:post_date');
+		$post_date_gmt  = $this->get_tag($post, 'wp:post_date_gmt');
+		$comment_status = $this->get_tag($post, 'wp:comment_status');
+		$ping_status    = $this->get_tag($post, 'wp:ping_status');
+		$status         = $this->get_tag($post, 'wp:status');
+		$post_name      = $this->get_tag($post, 'wp:post_name');
+		$post_parent    = $this->get_tag($post, 'wp:post_parent');
+		$menu_order     = $this->get_tag($post, 'wp:menu_order');
+		$post_type      = $this->get_tag($post, 'wp:post_type');
+		$post_password  = $this->get_tag($post, 'wp:post_password');
+		$is_sticky      = $this->get_tag($post, 'wp:is_sticky');
+		$guid           = $this->get_tag($post, 'guid');
+		$post_author    = $this->get_tag($post, 'dc:creator');
+
+		$post_excerpt = $this->get_tag($post, 'excerpt:encoded');
+		$post_excerpt = preg_replace_callback('|<(/?[A-Z]+)|', array(&$this, '_normalize_tag'), $post_excerpt);
+		$post_excerpt = str_replace('<br>', '<br />', $post_excerpt);
+		$post_excerpt = str_replace('<hr>', '<hr />', $post_excerpt);
+
+		$post_content = $this->get_tag($post, 'content:encoded');
+		$post_content = preg_replace_callback('|<(/?[A-Z]+)|', array(&$this, '_normalize_tag'), $post_content);
+		$post_content = str_replace('<br>', '<br />', $post_content);
+		$post_content = str_replace('<hr>', '<hr />', $post_content);
+
+		$postdata = compact('post_id', 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_excerpt',
 			'post_title', 'status', 'post_name', 'comment_status', 'ping_status', 'guid', 'post_parent',
 			'menu_order', 'post_type', 'post_password', 'is_sticky'
 		);
 
-		$attachment_url = $this->get_tag( $post, 'wp:attachment_url' );
-		if ( $attachment_url ) {
+		$attachment_url = $this->get_tag($post, 'wp:attachment_url');
+		if ($attachment_url) {
 					$postdata['attachment_url'] = $attachment_url;
 		}
 
-		preg_match_all( '|<category domain="([^"]+?)" nicename="([^"]+?)">(.+?)</category>|is', $post, $terms, PREG_SET_ORDER );
-		foreach ( $terms as $t ) {
+		preg_match_all('|<category domain="([^"]+?)" nicename="([^"]+?)">(.+?)</category>|is', $post, $terms, PREG_SET_ORDER);
+		foreach ($terms as $t) {
 			$post_terms[] = array(
 				'slug' => $t[2],
 				'domain' => $t[1],
-				'name' => str_replace( array( '<![CDATA[', ']]>' ), '', $t[3] ),
+				'name' => str_replace(array('<![CDATA[', ']]>'), '', $t[3]),
 			);
 		}
-		if ( ! empty( $post_terms ) ) {
+		if ( ! empty($post_terms)) {
 		    $postdata['terms'] = $post_terms;
 		}
 
-		preg_match_all( '|<wp:comment>(.+?)</wp:comment>|is', $post, $comments );
+		preg_match_all('|<wp:comment>(.+?)</wp:comment>|is', $post, $comments);
 		$comments = $comments[1];
-		if ( $comments ) {
-			foreach ( $comments as $comment ) {
-				preg_match_all( '|<wp:commentmeta>(.+?)</wp:commentmeta>|is', $comment, $commentmeta );
+		if ($comments) {
+			foreach ($comments as $comment) {
+				preg_match_all('|<wp:commentmeta>(.+?)</wp:commentmeta>|is', $comment, $commentmeta);
 				$commentmeta = $commentmeta[1];
 				$c_meta = array();
-				foreach ( $commentmeta as $m ) {
+				foreach ($commentmeta as $m) {
 					$c_meta[] = array(
-						'key' => $this->get_tag( $m, 'wp:meta_key' ),
-						'value' => $this->get_tag( $m, 'wp:meta_value' ),
+						'key' => $this->get_tag($m, 'wp:meta_key'),
+						'value' => $this->get_tag($m, 'wp:meta_value'),
 					);
 				}
 
 				$post_comments[] = array(
-					'comment_id' => $this->get_tag( $comment, 'wp:comment_id' ),
-					'comment_author' => $this->get_tag( $comment, 'wp:comment_author' ),
-					'comment_author_email' => $this->get_tag( $comment, 'wp:comment_author_email' ),
-					'comment_author_IP' => $this->get_tag( $comment, 'wp:comment_author_IP' ),
-					'comment_author_url' => $this->get_tag( $comment, 'wp:comment_author_url' ),
-					'comment_date' => $this->get_tag( $comment, 'wp:comment_date' ),
-					'comment_date_gmt' => $this->get_tag( $comment, 'wp:comment_date_gmt' ),
-					'comment_content' => $this->get_tag( $comment, 'wp:comment_content' ),
-					'comment_approved' => $this->get_tag( $comment, 'wp:comment_approved' ),
-					'comment_type' => $this->get_tag( $comment, 'wp:comment_type' ),
-					'comment_parent' => $this->get_tag( $comment, 'wp:comment_parent' ),
-					'comment_user_id' => $this->get_tag( $comment, 'wp:comment_user_id' ),
+					'comment_id' => $this->get_tag($comment, 'wp:comment_id'),
+					'comment_author' => $this->get_tag($comment, 'wp:comment_author'),
+					'comment_author_email' => $this->get_tag($comment, 'wp:comment_author_email'),
+					'comment_author_IP' => $this->get_tag($comment, 'wp:comment_author_IP'),
+					'comment_author_url' => $this->get_tag($comment, 'wp:comment_author_url'),
+					'comment_date' => $this->get_tag($comment, 'wp:comment_date'),
+					'comment_date_gmt' => $this->get_tag($comment, 'wp:comment_date_gmt'),
+					'comment_content' => $this->get_tag($comment, 'wp:comment_content'),
+					'comment_approved' => $this->get_tag($comment, 'wp:comment_approved'),
+					'comment_type' => $this->get_tag($comment, 'wp:comment_type'),
+					'comment_parent' => $this->get_tag($comment, 'wp:comment_parent'),
+					'comment_user_id' => $this->get_tag($comment, 'wp:comment_user_id'),
 					'commentmeta' => $c_meta,
 				);
 			}
 		}
-		if ( ! empty( $post_comments ) ) {
+		if ( ! empty($post_comments)) {
 		    $postdata['comments'] = $post_comments;
 		}
 
-		preg_match_all( '|<wp:postmeta>(.+?)</wp:postmeta>|is', $post, $postmeta );
+		preg_match_all('|<wp:postmeta>(.+?)</wp:postmeta>|is', $post, $postmeta);
 		$postmeta = $postmeta[1];
-		if ( $postmeta ) {
-			foreach ( $postmeta as $p ) {
+		if ($postmeta) {
+			foreach ($postmeta as $p) {
 				$post_postmeta[] = array(
-					'key' => $this->get_tag( $p, 'wp:meta_key' ),
-					'value' => $this->get_tag( $p, 'wp:meta_value' ),
+					'key' => $this->get_tag($p, 'wp:meta_key'),
+					'value' => $this->get_tag($p, 'wp:meta_value'),
 				);
 			}
 		}
-		if ( ! empty( $post_postmeta ) ) {
+		if ( ! empty($post_postmeta)) {
 		    $postdata['postmeta'] = $post_postmeta;
 		}
 
 		return $postdata;
 	}
 
-	function _normalize_tag( $matches ) {
-		return '<' . strtolower( $matches[1] );
+	function _normalize_tag($matches) {
+		return '<' . strtolower($matches[1]);
 	}
 
-	function fopen( $filename, $mode = 'r' ) {
-		if ( $this->has_gzip ) {
-					return gzopen( $filename, $mode );
+	function fopen($filename, $mode = 'r') {
+		if ($this->has_gzip) {
+					return gzopen($filename, $mode);
 		}
-		return fopen( $filename, $mode );
+		return fopen($filename, $mode);
 	}
 
-	function feof( $fp ) {
-		if ( $this->has_gzip ) {
-					return gzeof( $fp );
+	function feof($fp) {
+		if ($this->has_gzip) {
+					return gzeof($fp);
 		}
-		return feof( $fp );
+		return feof($fp);
 	}
 
-	function fgets( $fp, $len = 8192 ) {
-		if ( $this->has_gzip ) {
-					return gzgets( $fp, $len );
+	function fgets($fp, $len = 8192) {
+		if ($this->has_gzip) {
+					return gzgets($fp, $len);
 		}
-		return fgets( $fp, $len );
+		return fgets($fp, $len);
 	}
 
-	function fclose( $fp ) {
-		if ( $this->has_gzip ) {
-					return gzclose( $fp );
+	function fclose($fp) {
+		if ($this->has_gzip) {
+					return gzclose($fp);
 		}
-		return fclose( $fp );
+		return fclose($fp);
 	}
 }

tests/phpunit/data/plugins/wordpress-importer/wordpress-importer.php

Doc Comments +1 added lines, -1 removed lines

@@ -1215,7 +1215,7 @@
 	 * Decide if the given meta key maps to information we will want to import
 	 *
 	 * @param string $key The meta key to check
-	 * @return string|bool The key if we do want to import, false if not
+	 * @return false|string The key if we do want to import, false if not
 	 */
 	function is_valid_meta_key( $key ) {
 		// skip attachment metadata since we'll regenerate it from scratch

Indentation +1216 added lines, -1216 removed lines

@@ -11,7 +11,7 @@ 
 */
 
 if ( ! defined( 'WP_LOAD_IMPORTERS' ) ) {
-	return;
+    return;
 }
 
 /** Display verbose errors */
@@ -21,11 +21,11 @@ 
 require_once ABSPATH . 'wp-admin/includes/import.php';
 
 if ( ! class_exists( 'WP_Importer' ) ) {
-	$class_wp_importer = ABSPATH . 'wp-admin/includes/class-wp-importer.php';
-	if ( file_exists( $class_wp_importer ) ) {
-			require $class_wp_importer;
-	}
-	}
+    $class_wp_importer = ABSPATH . 'wp-admin/includes/class-wp-importer.php';
+    if ( file_exists( $class_wp_importer ) ) {
+            require $class_wp_importer;
+    }
+    }
 
 // include WXR file parsers
 require dirname( __FILE__ ) . '/parsers.php';
@@ -38,227 +38,227 @@ 
  */
 if ( class_exists( 'WP_Importer' ) ) {
 class WP_Import extends WP_Importer {
-	var $max_wxr_version = 1.2; // max. supported WXR version
-
-	var $id; // WXR attachment ID
-
-	// information to import from WXR file
-	var $version;
-	var $authors = array();
-	var $posts = array();
-	var $terms = array();
-	var $categories = array();
-	var $tags = array();
-	var $base_url = '';
-
-	// mappings from old information to new
-	var $processed_authors = array();
-	var $author_mapping = array();
-	var $processed_terms = array();
-	var $processed_posts = array();
-	var $post_orphans = array();
-	var $processed_menu_items = array();
-	var $menu_item_orphans = array();
-	var $missing_menu_items = array();
-
-	var $fetch_attachments = false;
-	var $url_remap = array();
-	var $featured_images = array();
-
-	/**
-	 * Registered callback function for the WordPress Importer
-	 *
-	 * Manages the three separate stages of the WXR import process
-	 */
-	function dispatch() {
-		$this->header();
-
-		$step = empty( $_GET['step'] ) ? 0 : (int) $_GET['step'];
-		switch ( $step ) {
-			case 0:
-				$this->greet();
-				break;
-			case 1:
-				check_admin_referer( 'import-upload' );
-				if ( $this->handle_upload() ) {
-									$this->import_options();
-				}
-				break;
-			case 2:
-				check_admin_referer( 'import-wordpress' );
-				$this->fetch_attachments = ( ! empty( $_POST['fetch_attachments'] ) && $this->allow_fetch_attachments() );
-				$this->id = (int) $_POST['import_id'];
-				$file = get_attached_file( $this->id );
-				set_time_limit(0);
-				$this->import( $file );
-				break;
-		}
-
-		$this->footer();
-	}
-
-	/**
-	 * The main controller for the actual import stage.
-	 *
-	 * @param string $file Path to the WXR file for importing
-	 */
-	function import( $file ) {
-		add_filter( 'import_post_meta_key', array( $this, 'is_valid_meta_key' ) );
-		add_filter( 'http_request_timeout', array( &$this, 'bump_request_timeout' ) );
-
-		$this->import_start( $file );
-
-		$this->get_author_mapping();
-
-		wp_suspend_cache_invalidation( true );
-		$this->process_categories();
-		$this->process_tags();
-		$this->process_terms();
-		$this->process_posts();
-		wp_suspend_cache_invalidation( false );
-
-		// update incorrect/missing information in the DB
-		$this->backfill_parents();
-		$this->backfill_attachment_urls();
-		$this->remap_featured_images();
-
-		$this->import_end();
-	}
-
-	/**
-	 * Parses the WXR file and prepares us for the task of processing parsed data
-	 *
-	 * @param string $file Path to the WXR file for importing
-	 */
-	function import_start( $file ) {
-		if ( ! is_file($file) ) {
-			echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
-			echo __( 'The file does not exist, please try again.', 'wordpress-importer' ) . '</p>';
-			$this->footer();
-			die();
-		}
-
-		$import_data = $this->parse( $file );
-
-		if ( is_wp_error( $import_data ) ) {
-			echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
-			echo esc_html( $import_data->get_error_message() ) . '</p>';
-			$this->footer();
-			die();
-		}
-
-		$this->version = $import_data['version'];
-		$this->get_authors_from_import( $import_data );
-		$this->posts = $import_data['posts'];
-		$this->terms = $import_data['terms'];
-		$this->categories = $import_data['categories'];
-		$this->tags = $import_data['tags'];
-		$this->base_url = esc_url( $import_data['base_url'] );
-
-		wp_defer_term_counting( true );
-		wp_defer_comment_counting( true );
-
-		do_action( 'import_start' );
-	}
-
-	/**
-	 * Performs post-import cleanup of files and the cache
-	 */
-	function import_end() {
-		wp_import_cleanup( $this->id );
-
-		wp_cache_flush();
-		foreach ( get_taxonomies() as $tax ) {
-			delete_option( "{$tax}_children" );
-			_get_term_hierarchy( $tax );
-		}
-
-		wp_defer_term_counting( false );
-		wp_defer_comment_counting( false );
-
-		echo '<p>' . __( 'All done.', 'wordpress-importer' ) . ' <a href="' . admin_url() . '">' . __( 'Have fun!', 'wordpress-importer' ) . '</a>' . '</p>';
-		echo '<p>' . __( 'Remember to update the passwords and roles of imported users.', 'wordpress-importer' ) . '</p>';
-
-		do_action( 'import_end' );
-	}
-
-	/**
-	 * Handles the WXR upload and initial parsing of the file to prepare for
-	 * displaying author import options
-	 *
-	 * @return bool False if error uploading or invalid file, true otherwise
-	 */
-	function handle_upload() {
-		$file = wp_import_handle_upload();
-
-		if ( isset( $file['error'] ) ) {
-			echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
-			echo esc_html( $file['error'] ) . '</p>';
-			return false;
-		} else if ( ! file_exists( $file['file'] ) ) {
-			echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
-			printf( __( 'The export file could not be found at <code>%s</code>. It is likely that this was caused by a permissions problem.', 'wordpress-importer' ), esc_html( $file['file'] ) );
-			echo '</p>';
-			return false;
-		}
-
-		$this->id = (int) $file['id'];
-		$import_data = $this->parse( $file['file'] );
-		if ( is_wp_error( $import_data ) ) {
-			echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
-			echo esc_html( $import_data->get_error_message() ) . '</p>';
-			return false;
-		}
-
-		$this->version = $import_data['version'];
-		if ( $this->version > $this->max_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 consider updating.', 'wordpress-importer' ), esc_html($import_data['version']) );
-			echo '</strong></p></div>';
-		}
-
-		$this->get_authors_from_import( $import_data );
-
-		return true;
-	}
-
-	/**
-	 * Retrieve authors from parsed WXR data
-	 *
-	 * Uses the provided author information from WXR 1.1 files
-	 * or extracts info from each post for WXR 1.0 files
-	 *
-	 * @param array $import_data Data returned by a WXR parser
-	 */
-	function get_authors_from_import( $import_data ) {
-		if ( ! empty( $import_data['authors'] ) ) {
-			$this->authors = $import_data['authors'];
-		// no author information, grab it from the posts
-		} else {
-			foreach ( $import_data['posts'] as $post ) {
-				$login = sanitize_user( $post['post_author'], true );
-				if ( empty( $login ) ) {
-					printf( __( 'Failed to import author %s. Their posts will be attributed to the current user.', 'wordpress-importer' ), esc_html( $post['post_author'] ) );
-					echo '<br />';
-					continue;
-				}
-
-				if ( ! isset($this->authors[$login]) ) {
-									$this->authors[$login] = array(
-						'author_login' => $login,
-						'author_display_name' => $post['post_author']
-					);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Display pre-import options, author importing/mapping and option to
-	 * fetch attachments
-	 */
-	function import_options() {
-		$j = 0;
+    var $max_wxr_version = 1.2; // max. supported WXR version
+
+    var $id; // WXR attachment ID
+
+    // information to import from WXR file
+    var $version;
+    var $authors = array();
+    var $posts = array();
+    var $terms = array();
+    var $categories = array();
+    var $tags = array();
+    var $base_url = '';
+
+    // mappings from old information to new
+    var $processed_authors = array();
+    var $author_mapping = array();
+    var $processed_terms = array();
+    var $processed_posts = array();
+    var $post_orphans = array();
+    var $processed_menu_items = array();
+    var $menu_item_orphans = array();
+    var $missing_menu_items = array();
+
+    var $fetch_attachments = false;
+    var $url_remap = array();
+    var $featured_images = array();
+
+    /**
+     * Registered callback function for the WordPress Importer
+     *
+     * Manages the three separate stages of the WXR import process
+     */
+    function dispatch() {
+        $this->header();
+
+        $step = empty( $_GET['step'] ) ? 0 : (int) $_GET['step'];
+        switch ( $step ) {
+            case 0:
+                $this->greet();
+                break;
+            case 1:
+                check_admin_referer( 'import-upload' );
+                if ( $this->handle_upload() ) {
+                                    $this->import_options();
+                }
+                break;
+            case 2:
+                check_admin_referer( 'import-wordpress' );
+                $this->fetch_attachments = ( ! empty( $_POST['fetch_attachments'] ) && $this->allow_fetch_attachments() );
+                $this->id = (int) $_POST['import_id'];
+                $file = get_attached_file( $this->id );
+                set_time_limit(0);
+                $this->import( $file );
+                break;
+        }
+
+        $this->footer();
+    }
+
+    /**
+     * The main controller for the actual import stage.
+     *
+     * @param string $file Path to the WXR file for importing
+     */
+    function import( $file ) {
+        add_filter( 'import_post_meta_key', array( $this, 'is_valid_meta_key' ) );
+        add_filter( 'http_request_timeout', array( &$this, 'bump_request_timeout' ) );
+
+        $this->import_start( $file );
+
+        $this->get_author_mapping();
+
+        wp_suspend_cache_invalidation( true );
+        $this->process_categories();
+        $this->process_tags();
+        $this->process_terms();
+        $this->process_posts();
+        wp_suspend_cache_invalidation( false );
+
+        // update incorrect/missing information in the DB
+        $this->backfill_parents();
+        $this->backfill_attachment_urls();
+        $this->remap_featured_images();
+
+        $this->import_end();
+    }
+
+    /**
+     * Parses the WXR file and prepares us for the task of processing parsed data
+     *
+     * @param string $file Path to the WXR file for importing
+     */
+    function import_start( $file ) {
+        if ( ! is_file($file) ) {
+            echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
+            echo __( 'The file does not exist, please try again.', 'wordpress-importer' ) . '</p>';
+            $this->footer();
+            die();
+        }
+
+        $import_data = $this->parse( $file );
+
+        if ( is_wp_error( $import_data ) ) {
+            echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
+            echo esc_html( $import_data->get_error_message() ) . '</p>';
+            $this->footer();
+            die();
+        }
+
+        $this->version = $import_data['version'];
+        $this->get_authors_from_import( $import_data );
+        $this->posts = $import_data['posts'];
+        $this->terms = $import_data['terms'];
+        $this->categories = $import_data['categories'];
+        $this->tags = $import_data['tags'];
+        $this->base_url = esc_url( $import_data['base_url'] );
+
+        wp_defer_term_counting( true );
+        wp_defer_comment_counting( true );
+
+        do_action( 'import_start' );
+    }
+
+    /**
+     * Performs post-import cleanup of files and the cache
+     */
+    function import_end() {
+        wp_import_cleanup( $this->id );
+
+        wp_cache_flush();
+        foreach ( get_taxonomies() as $tax ) {
+            delete_option( "{$tax}_children" );
+            _get_term_hierarchy( $tax );
+        }
+
+        wp_defer_term_counting( false );
+        wp_defer_comment_counting( false );
+
+        echo '<p>' . __( 'All done.', 'wordpress-importer' ) . ' <a href="' . admin_url() . '">' . __( 'Have fun!', 'wordpress-importer' ) . '</a>' . '</p>';
+        echo '<p>' . __( 'Remember to update the passwords and roles of imported users.', 'wordpress-importer' ) . '</p>';
+
+        do_action( 'import_end' );
+    }
+
+    /**
+     * Handles the WXR upload and initial parsing of the file to prepare for
+     * displaying author import options
+     *
+     * @return bool False if error uploading or invalid file, true otherwise
+     */
+    function handle_upload() {
+        $file = wp_import_handle_upload();
+
+        if ( isset( $file['error'] ) ) {
+            echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
+            echo esc_html( $file['error'] ) . '</p>';
+            return false;
+        } else if ( ! file_exists( $file['file'] ) ) {
+            echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
+            printf( __( 'The export file could not be found at <code>%s</code>. It is likely that this was caused by a permissions problem.', 'wordpress-importer' ), esc_html( $file['file'] ) );
+            echo '</p>';
+            return false;
+        }
+
+        $this->id = (int) $file['id'];
+        $import_data = $this->parse( $file['file'] );
+        if ( is_wp_error( $import_data ) ) {
+            echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
+            echo esc_html( $import_data->get_error_message() ) . '</p>';
+            return false;
+        }
+
+        $this->version = $import_data['version'];
+        if ( $this->version > $this->max_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 consider updating.', 'wordpress-importer' ), esc_html($import_data['version']) );
+            echo '</strong></p></div>';
+        }
+
+        $this->get_authors_from_import( $import_data );
+
+        return true;
+    }
+
+    /**
+     * Retrieve authors from parsed WXR data
+     *
+     * Uses the provided author information from WXR 1.1 files
+     * or extracts info from each post for WXR 1.0 files
+     *
+     * @param array $import_data Data returned by a WXR parser
+     */
+    function get_authors_from_import( $import_data ) {
+        if ( ! empty( $import_data['authors'] ) ) {
+            $this->authors = $import_data['authors'];
+        // no author information, grab it from the posts
+        } else {
+            foreach ( $import_data['posts'] as $post ) {
+                $login = sanitize_user( $post['post_author'], true );
+                if ( empty( $login ) ) {
+                    printf( __( 'Failed to import author %s. Their posts will be attributed to the current user.', 'wordpress-importer' ), esc_html( $post['post_author'] ) );
+                    echo '<br />';
+                    continue;
+                }
+
+                if ( ! isset($this->authors[$login]) ) {
+                                    $this->authors[$login] = array(
+                        'author_login' => $login,
+                        'author_display_name' => $post['post_author']
+                    );
+                }
+            }
+        }
+    }
+
+    /**
+     * Display pre-import options, author importing/mapping and option to
+     * fetch attachments
+     */
+    function import_options() {
+        $j = 0;
 ?>
 <form action="<?php echo admin_url( 'admin.php?import=wordpress&amp;step=2' ); ?>" method="post">
 	<?php wp_nonce_field( 'import-wordpress' ); ?>
@@ -288,999 +288,999 @@ 
 	<p class="submit"><input type="submit" class="button" value="<?php esc_attr_e( 'Submit', 'wordpress-importer' ); ?>" /></p>
 </form>
 <?php
-	}
-
-	/**
-	 * Display import options for an individual author. That is, either create
-	 * a new user based on import info or map to an existing user
-	 *
-	 * @param int $n Index for each author in the form
-	 * @param array $author Author information, e.g. login, display name, email
-	 */
-	function author_select( $n, $author ) {
-		_e( 'Import author:', 'wordpress-importer' );
-		echo ' <strong>' . esc_html( $author['author_display_name'] );
-		if ( $this->version != '1.0' ) {
-		    echo ' (' . esc_html( $author['author_login'] ) . ')';
-		}
-		echo '</strong><br />';
-
-		if ( $this->version != '1.0' ) {
-					echo '<div style="margin-left:18px">';
-		}
-
-		$create_users = $this->allow_create_users();
-		if ( $create_users ) {
-			if ( $this->version != '1.0' ) {
-				_e( 'or create new user with login name:', 'wordpress-importer' );
-				$value = '';
-			} else {
-				_e( 'as a new user:', 'wordpress-importer' );
-				$value = esc_attr( sanitize_user( $author['author_login'], true ) );
-			}
-
-			echo ' <input type="text" name="user_new['.$n.']" value="'. $value .'" /><br />';
-		}
-
-		if ( ! $create_users && $this->version == '1.0' ) {
-					_e( 'assign posts to an existing user:', 'wordpress-importer' );
-		} else {
-					_e( 'or assign posts to an existing user:', 'wordpress-importer' );
-		}
-		wp_dropdown_users( array( 'name' => "user_map[$n]", 'multi' => true, 'show_option_all' => __( '- Select -', 'wordpress-importer' ) ) );
-		echo '<input type="hidden" name="imported_authors['.$n.']" value="' . esc_attr( $author['author_login'] ) . '" />';
-
-		if ( $this->version != '1.0' ) {
-					echo '</div>';
-		}
-	}
-
-	/**
-	 * Map old author logins to local user IDs based on decisions made
-	 * in import options form. Can map to an existing user, create a new user
-	 * or falls back to the current user in case of error with either of the previous
-	 */
-	function get_author_mapping() {
-		if ( ! isset( $_POST['imported_authors'] ) ) {
-					return;
-		}
-
-		$create_users = $this->allow_create_users();
-
-		foreach ( (array) $_POST['imported_authors'] as $i => $old_login ) {
-			// Multisite adds strtolower to sanitize_user. Need to sanitize here to stop breakage in process_posts.
-			$santized_old_login = sanitize_user( $old_login, true );
-			$old_id = isset( $this->authors[$old_login]['author_id'] ) ? intval($this->authors[$old_login]['author_id']) : false;
-
-			if ( ! empty( $_POST['user_map'][$i] ) ) {
-				$user = get_userdata( intval($_POST['user_map'][$i]) );
-				if ( isset( $user->ID ) ) {
-					if ( $old_id ) {
-											$this->processed_authors[$old_id] = $user->ID;
-					}
-					$this->author_mapping[$santized_old_login] = $user->ID;
-				}
-			} else if ( $create_users ) {
-				if ( ! empty($_POST['user_new'][$i]) ) {
-					$user_id = wp_create_user( $_POST['user_new'][$i], wp_generate_password() );
-				} else if ( $this->version != '1.0' ) {
-					$user_data = array(
-						'user_login' => $old_login,
-						'user_pass' => wp_generate_password(),
-						'user_email' => isset( $this->authors[$old_login]['author_email'] ) ? $this->authors[$old_login]['author_email'] : '',
-						'display_name' => $this->authors[$old_login]['author_display_name'],
-						'first_name' => isset( $this->authors[$old_login]['author_first_name'] ) ? $this->authors[$old_login]['author_first_name'] : '',
-						'last_name' => isset( $this->authors[$old_login]['author_last_name'] ) ? $this->authors[$old_login]['author_last_name'] : '',
-					);
-					$user_id = wp_insert_user( $user_data );
-				}
-
-				if ( ! is_wp_error( $user_id ) ) {
-					if ( $old_id ) {
-											$this->processed_authors[$old_id] = $user_id;
-					}
-					$this->author_mapping[$santized_old_login] = $user_id;
-				} else {
-					printf( __( 'Failed to create new user for %s. Their posts will be attributed to the current user.', 'wordpress-importer' ), esc_html($this->authors[$old_login]['author_display_name']) );
-					if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
-											echo ' ' . $user_id->get_error_message();
-					}
-					echo '<br />';
-				}
-			}
-
-			// failsafe: if the user_id was invalid, default to the current user
-			if ( ! isset( $this->author_mapping[$santized_old_login] ) ) {
-				if ( $old_id ) {
-									$this->processed_authors[$old_id] = (int) get_current_user_id();
-				}
-				$this->author_mapping[$santized_old_login] = (int) get_current_user_id();
-			}
-		}
-	}
-
-	/**
-	 * Create new categories based on import information
-	 *
-	 * Doesn't create a new category if its slug already exists
-	 */
-	function process_categories() {
-		$this->categories = apply_filters( 'wp_import_categories', $this->categories );
-
-		if ( empty( $this->categories ) ) {
-					return;
-		}
-
-		foreach ( $this->categories as $cat ) {
-			// if the category already exists leave it alone
-			$term_id = term_exists( $cat['category_nicename'], 'category' );
-			if ( $term_id ) {
-				if ( is_array($term_id) ) {
-				    $term_id = $term_id['term_id'];
-				}
-				if ( isset($cat['term_id']) ) {
-									$this->processed_terms[intval($cat['term_id'])] = (int) $term_id;
-				}
-				continue;
-			}
-
-			$category_parent = empty( $cat['category_parent'] ) ? 0 : category_exists( $cat['category_parent'] );
-			$category_description = isset( $cat['category_description'] ) ? $cat['category_description'] : '';
-			$catarr = array(
-				'category_nicename' => $cat['category_nicename'],
-				'category_parent' => $category_parent,
-				'cat_name' => $cat['cat_name'],
-				'category_description' => $category_description
-			);
-			$catarr = wp_slash( $catarr );
-
-			$id = wp_insert_category( $catarr );
-			if ( ! is_wp_error( $id ) ) {
-				if ( isset($cat['term_id']) ) {
-									$this->processed_terms[intval($cat['term_id'])] = $id;
-				}
-			} else {
-				printf( __( 'Failed to import category %s', 'wordpress-importer' ), esc_html($cat['category_nicename']) );
-				if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
-									echo ': ' . $id->get_error_message();
-				}
-				echo '<br />';
-				continue;
-			}
-
-			$this->process_termmeta( $cat, $id['term_id'] );
-		}
-
-		unset( $this->categories );
-	}
-
-	/**
-	 * Create new post tags based on import information
-	 *
-	 * Doesn't create a tag if its slug already exists
-	 */
-	function process_tags() {
-		$this->tags = apply_filters( 'wp_import_tags', $this->tags );
-
-		if ( empty( $this->tags ) ) {
-					return;
-		}
-
-		foreach ( $this->tags as $tag ) {
-			// if the tag already exists leave it alone
-			$term_id = term_exists( $tag['tag_slug'], 'post_tag' );
-			if ( $term_id ) {
-				if ( is_array($term_id) ) {
-				    $term_id = $term_id['term_id'];
-				}
-				if ( isset($tag['term_id']) ) {
-									$this->processed_terms[intval($tag['term_id'])] = (int) $term_id;
-				}
-				continue;
-			}
-
-			$tag = wp_slash( $tag );
-			$tag_desc = isset( $tag['tag_description'] ) ? $tag['tag_description'] : '';
-			$tagarr = array( 'slug' => $tag['tag_slug'], 'description' => $tag_desc );
-
-			$id = wp_insert_term( $tag['tag_name'], 'post_tag', $tagarr );
-			if ( ! is_wp_error( $id ) ) {
-				if ( isset($tag['term_id']) ) {
-									$this->processed_terms[intval($tag['term_id'])] = $id['term_id'];
-				}
-			} else {
-				printf( __( 'Failed to import post tag %s', 'wordpress-importer' ), esc_html($tag['tag_name']) );
-				if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
-									echo ': ' . $id->get_error_message();
-				}
-				echo '<br />';
-				continue;
-			}
-
-			$this->process_termmeta( $tag, $id['term_id'] );
-		}
-
-		unset( $this->tags );
-	}
-
-	/**
-	 * Create new terms based on import information
-	 *
-	 * Doesn't create a term its slug already exists
-	 */
-	function process_terms() {
-		$this->terms = apply_filters( 'wp_import_terms', $this->terms );
-
-		if ( empty( $this->terms ) ) {
-					return;
-		}
-
-		foreach ( $this->terms as $term ) {
-			// if the term already exists in the correct taxonomy leave it alone
-			$term_id = term_exists( $term['slug'], $term['term_taxonomy'] );
-			if ( $term_id ) {
-				if ( is_array($term_id) ) {
-				    $term_id = $term_id['term_id'];
-				}
-				if ( isset($term['term_id']) ) {
-									$this->processed_terms[intval($term['term_id'])] = (int) $term_id;
-				}
-				continue;
-			}
-
-			if ( empty( $term['term_parent'] ) ) {
-				$parent = 0;
-			} else {
-				$parent = term_exists( $term['term_parent'], $term['term_taxonomy'] );
-				if ( is_array( $parent ) ) {
-				    $parent = $parent['term_id'];
-				}
-			}
-			$term = wp_slash( $term );
-			$description = isset( $term['term_description'] ) ? $term['term_description'] : '';
-			$termarr = array( 'slug' => $term['slug'], 'description' => $description, 'parent' => intval($parent) );
-
-			$id = wp_insert_term( $term['term_name'], $term['term_taxonomy'], $termarr );
-			if ( ! is_wp_error( $id ) ) {
-				if ( isset($term['term_id']) ) {
-									$this->processed_terms[intval($term['term_id'])] = $id['term_id'];
-				}
-			} else {
-				printf( __( 'Failed to import %s %s', 'wordpress-importer' ), esc_html($term['term_taxonomy']), esc_html($term['term_name']) );
-				if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
-									echo ': ' . $id->get_error_message();
-				}
-				echo '<br />';
-				continue;
-			}
-
-			$this->process_termmeta( $term, $id['term_id'] );
-		}
-
-		unset( $this->terms );
-	}
-
-	/**
-	 * Add metadata to imported term.
-	 *
-	 * @since 0.6.2
-	 *
-	 * @param array $term    Term data from WXR import.
-	 * @param int   $term_id ID of the newly created term.
-	 */
-	protected function process_termmeta( $term, $term_id ) {
-		if ( ! isset( $term['termmeta'] ) ) {
-			$term['termmeta'] = array();
-		}
-
-		/**
-		 * Filters the metadata attached to an imported term.
-		 *
-		 * @since 0.6.2
-		 *
-		 * @param array $termmeta Array of term meta.
-		 * @param int   $term_id  ID of the newly created term.
-		 * @param array $term     Term data from the WXR import.
-		 */
-		$term['termmeta'] = apply_filters( 'wp_import_term_meta', $term['termmeta'], $term_id, $term );
-
-		if ( empty( $term['termmeta'] ) ) {
-			return;
-		}
-
-		foreach ( $term['termmeta'] as $meta ) {
-			/**
-			 * Filters the meta key for an imported piece of term meta.
-			 *
-			 * @since 0.6.2
-			 *
-			 * @param string $meta_key Meta key.
-			 * @param int    $term_id  ID of the newly created term.
-			 * @param array  $term     Term data from the WXR import.
-			 */
-			$key = apply_filters( 'import_term_meta_key', $meta['key'], $term_id, $term );
-			if ( ! $key ) {
-				continue;
-			}
-
-			// Export gets meta straight from the DB so could have a serialized string
-			$value = maybe_unserialize( $meta['value'] );
-
-			add_term_meta( $term_id, $key, $value );
-
-			/**
-			 * Fires after term meta is imported.
-			 *
-			 * @since 0.6.2
-			 *
-			 * @param int    $term_id ID of the newly created term.
-			 * @param string $key     Meta key.
-			 * @param mixed  $value   Meta value.
-			 */
-			do_action( 'import_term_meta', $term_id, $key, $value );
-		}
-	}
-
-	/**
-	 * Create new posts based on import information
-	 *
-	 * Posts marked as having a parent which doesn't exist will become top level items.
-	 * Doesn't create a new post if: the post type doesn't exist, the given post ID
-	 * is already noted as imported or a post with the same title and date already exists.
-	 * Note that new/updated terms, comments and meta are imported for the last of the above.
-	 */
-	function process_posts() {
-		$this->posts = apply_filters( 'wp_import_posts', $this->posts );
-
-		foreach ( $this->posts as $post ) {
-			$post = apply_filters( 'wp_import_post_data_raw', $post );
-
-			if ( ! post_type_exists( $post['post_type'] ) ) {
-				printf( __( 'Failed to import &#8220;%s&#8221;: Invalid post type %s', 'wordpress-importer' ),
-					esc_html($post['post_title']), esc_html($post['post_type']) );
-				echo '<br />';
-				do_action( 'wp_import_post_exists', $post );
-				continue;
-			}
-
-			if ( isset( $this->processed_posts[$post['post_id']] ) && ! empty( $post['post_id'] ) ) {
-							continue;
-			}
-
-			if ( $post['status'] == 'auto-draft' ) {
-							continue;
-			}
-
-			if ( 'nav_menu_item' == $post['post_type'] ) {
-				$this->process_menu_item( $post );
-				continue;
-			}
-
-			$post_type_object = get_post_type_object( $post['post_type'] );
-
-			$post_exists = post_exists( $post['post_title'], '', $post['post_date'] );
-
-			/**
-			* Filter ID of the existing post corresponding to post currently importing.
-			*
-			* Return 0 to force the post to be imported. Filter the ID to be something else
-			* to override which existing post is mapped to the imported post.
-			*
-			* @see post_exists()
-			* @since 0.6.2
-			*
-			* @param int   $post_exists  Post ID, or 0 if post did not exist.
-			* @param array $post         The post array to be inserted.
-			*/
-			$post_exists = apply_filters( 'wp_import_existing_post', $post_exists, $post );
-
-			if ( $post_exists && get_post_type( $post_exists ) == $post['post_type'] ) {
-				printf( __('%s &#8220;%s&#8221; already exists.', 'wordpress-importer'), $post_type_object->labels->singular_name, esc_html($post['post_title']) );
-				echo '<br />';
-				$comment_post_ID = $post_id = $post_exists;
-				$this->processed_posts[ intval( $post['post_id'] ) ] = intval( $post_exists );
-			} else {
-				$post_parent = (int) $post['post_parent'];
-				if ( $post_parent ) {
-					// if we already know the parent, map it to the new local ID
-					if ( isset( $this->processed_posts[$post_parent] ) ) {
-						$post_parent = $this->processed_posts[$post_parent];
-					// otherwise record the parent for later
-					} else {
-						$this->post_orphans[intval($post['post_id'])] = $post_parent;
-						$post_parent = 0;
-					}
-				}
-
-				// map the post author
-				$author = sanitize_user( $post['post_author'], true );
-				if ( isset( $this->author_mapping[$author] ) ) {
-									$author = $this->author_mapping[$author];
-				} else {
-									$author = (int) get_current_user_id();
-				}
-
-				$postdata = array(
-					'import_id' => $post['post_id'], 'post_author' => $author, 'post_date' => $post['post_date'],
-					'post_date_gmt' => $post['post_date_gmt'], 'post_content' => $post['post_content'],
-					'post_excerpt' => $post['post_excerpt'], 'post_title' => $post['post_title'],
-					'post_status' => $post['status'], 'post_name' => $post['post_name'],
-					'comment_status' => $post['comment_status'], 'ping_status' => $post['ping_status'],
-					'guid' => $post['guid'], 'post_parent' => $post_parent, 'menu_order' => $post['menu_order'],
-					'post_type' => $post['post_type'], 'post_password' => $post['post_password']
-				);
-
-				$original_post_ID = $post['post_id'];
-				$postdata = apply_filters( 'wp_import_post_data_processed', $postdata, $post );
-
-				$postdata = wp_slash( $postdata );
-
-				if ( 'attachment' == $postdata['post_type'] ) {
-					$remote_url = ! empty($post['attachment_url']) ? $post['attachment_url'] : $post['guid'];
-
-					// try to use _wp_attached file for upload folder placement to ensure the same location as the export site
-					// e.g. location is 2003/05/image.jpg but the attachment post_date is 2010/09, see media_handle_upload()
-					$postdata['upload_date'] = $post['post_date'];
-					if ( isset( $post['postmeta'] ) ) {
-						foreach( $post['postmeta'] as $meta ) {
-							if ( $meta['key'] == '_wp_attached_file' ) {
-								if ( preg_match( '%^[0-9]{4}/[0-9]{2}%', $meta['value'], $matches ) ) {
-																	$postdata['upload_date'] = $matches[0];
-								}
-								break;
-							}
-						}
-					}
-
-					$comment_post_ID = $post_id = $this->process_attachment( $postdata, $remote_url );
-				} else {
-					$comment_post_ID = $post_id = wp_insert_post( $postdata, true );
-					do_action( 'wp_import_insert_post', $post_id, $original_post_ID, $postdata, $post );
-				}
-
-				if ( is_wp_error( $post_id ) ) {
-					printf( __( 'Failed to import %s &#8220;%s&#8221;', 'wordpress-importer' ),
-						$post_type_object->labels->singular_name, esc_html($post['post_title']) );
-					if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
-											echo ': ' . $post_id->get_error_message();
-					}
-					echo '<br />';
-					continue;
-				}
-
-				if ( $post['is_sticky'] == 1 ) {
-									stick_post( $post_id );
-				}
-			}
-
-			// map pre-import ID to local ID
-			$this->processed_posts[intval($post['post_id'])] = (int) $post_id;
-
-			if ( ! isset( $post['terms'] ) ) {
-							$post['terms'] = array();
-			}
-
-			$post['terms'] = apply_filters( 'wp_import_post_terms', $post['terms'], $post_id, $post );
-
-			// add categories, tags and other terms
-			if ( ! empty( $post['terms'] ) ) {
-				$terms_to_set = array();
-				foreach ( $post['terms'] as $term ) {
-					// back compat with WXR 1.0 map 'tag' to 'post_tag'
-					$taxonomy = ( 'tag' == $term['domain'] ) ? 'post_tag' : $term['domain'];
-					$term_exists = term_exists( $term['slug'], $taxonomy );
-					$term_id = is_array( $term_exists ) ? $term_exists['term_id'] : $term_exists;
-					if ( ! $term_id ) {
-						$t = wp_insert_term( $term['name'], $taxonomy, array( 'slug' => $term['slug'] ) );
-						if ( ! is_wp_error( $t ) ) {
-							$term_id = $t['term_id'];
-							do_action( 'wp_import_insert_term', $t, $term, $post_id, $post );
-						} else {
-							printf( __( 'Failed to import %s %s', 'wordpress-importer' ), esc_html($taxonomy), esc_html($term['name']) );
-							if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
-															echo ': ' . $t->get_error_message();
-							}
-							echo '<br />';
-							do_action( 'wp_import_insert_term_failed', $t, $term, $post_id, $post );
-							continue;
-						}
-					}
-					$terms_to_set[$taxonomy][] = intval( $term_id );
-				}
-
-				foreach ( $terms_to_set as $tax => $ids ) {
-					$tt_ids = wp_set_post_terms( $post_id, $ids, $tax );
-					do_action( 'wp_import_set_post_terms', $tt_ids, $ids, $tax, $post_id, $post );
-				}
-				unset( $post['terms'], $terms_to_set );
-			}
-
-			if ( ! isset( $post['comments'] ) ) {
-							$post['comments'] = array();
-			}
-
-			$post['comments'] = apply_filters( 'wp_import_post_comments', $post['comments'], $post_id, $post );
-
-			// add/update comments
-			if ( ! empty( $post['comments'] ) ) {
-				$num_comments = 0;
-				$inserted_comments = array();
-				foreach ( $post['comments'] as $comment ) {
-					$comment_id	= $comment['comment_id'];
-					$newcomments[$comment_id]['comment_post_ID']      = $comment_post_ID;
-					$newcomments[$comment_id]['comment_author']       = $comment['comment_author'];
-					$newcomments[$comment_id]['comment_author_email'] = $comment['comment_author_email'];
-					$newcomments[$comment_id]['comment_author_IP']    = $comment['comment_author_IP'];
-					$newcomments[$comment_id]['comment_author_url']   = $comment['comment_author_url'];
-					$newcomments[$comment_id]['comment_date']         = $comment['comment_date'];
-					$newcomments[$comment_id]['comment_date_gmt']     = $comment['comment_date_gmt'];
-					$newcomments[$comment_id]['comment_content']      = $comment['comment_content'];
-					$newcomments[$comment_id]['comment_approved']     = $comment['comment_approved'];
-					$newcomments[$comment_id]['comment_type']         = $comment['comment_type'];
-					$newcomments[$comment_id]['comment_parent'] 	  = $comment['comment_parent'];
-					$newcomments[$comment_id]['commentmeta']          = isset( $comment['commentmeta'] ) ? $comment['commentmeta'] : array();
-					if ( isset( $this->processed_authors[$comment['comment_user_id']] ) ) {
-											$newcomments[$comment_id]['user_id'] = $this->processed_authors[$comment['comment_user_id']];
-					}
-				}
-				ksort( $newcomments );
-
-				foreach ( $newcomments as $key => $comment ) {
-					// if this is a new post we can skip the comment_exists() check
-					if ( ! $post_exists || ! comment_exists( $comment['comment_author'], $comment['comment_date'] ) ) {
-						if ( isset( $inserted_comments[$comment['comment_parent']] ) ) {
-													$comment['comment_parent'] = $inserted_comments[$comment['comment_parent']];
-						}
-						$comment = wp_filter_comment( $comment );
-						$inserted_comments[$key] = wp_insert_comment( $comment );
-						do_action( 'wp_import_insert_comment', $inserted_comments[$key], $comment, $comment_post_ID, $post );
-
-						foreach( $comment['commentmeta'] as $meta ) {
-							$value = maybe_unserialize( $meta['value'] );
-							add_comment_meta( $inserted_comments[$key], $meta['key'], $value );
-						}
-
-						$num_comments++;
-					}
-				}
-				unset( $newcomments, $inserted_comments, $post['comments'] );
-			}
-
-			if ( ! isset( $post['postmeta'] ) ) {
-							$post['postmeta'] = array();
-			}
-
-			$post['postmeta'] = apply_filters( 'wp_import_post_meta', $post['postmeta'], $post_id, $post );
-
-			// add/update post meta
-			if ( ! empty( $post['postmeta'] ) ) {
-				foreach ( $post['postmeta'] as $meta ) {
-					$key = apply_filters( 'import_post_meta_key', $meta['key'], $post_id, $post );
-					$value = false;
-
-					if ( '_edit_last' == $key ) {
-						if ( isset( $this->processed_authors[intval($meta['value'])] ) ) {
-													$value = $this->processed_authors[intval($meta['value'])];
-						} else {
-													$key = false;
-						}
-					}
-
-					if ( $key ) {
-						// export gets meta straight from the DB so could have a serialized string
-						if ( ! $value ) {
-													$value = maybe_unserialize( $meta['value'] );
-						}
-
-						add_post_meta( $post_id, $key, $value );
-						do_action( 'import_post_meta', $post_id, $key, $value );
-
-						// if the post has a featured image, take note of this in case of remap
-						if ( '_thumbnail_id' == $key ) {
-													$this->featured_images[$post_id] = (int) $value;
-						}
-					}
-				}
-			}
-		}
-
-		unset( $this->posts );
-	}
-
-	/**
-	 * Attempt to create a new menu item from import data
-	 *
-	 * Fails for draft, orphaned menu items and those without an associated nav_menu
-	 * or an invalid nav_menu term. If the post type or term object which the menu item
-	 * represents doesn't exist then the menu item will not be imported (waits until the
-	 * end of the import to retry again before discarding).
-	 *
-	 * @param array $item Menu item details from WXR file
-	 */
-	function process_menu_item( $item ) {
-		// skip draft, orphaned menu items
-		if ( 'draft' == $item['status'] ) {
-					return;
-		}
-
-		$menu_slug = false;
-		if ( isset($item['terms']) ) {
-			// loop through terms, assume first nav_menu term is correct menu
-			foreach ( $item['terms'] as $term ) {
-				if ( 'nav_menu' == $term['domain'] ) {
-					$menu_slug = $term['slug'];
-					break;
-				}
-			}
-		}
-
-		// no nav_menu term associated with this menu item
-		if ( ! $menu_slug ) {
-			_e( 'Menu item skipped due to missing menu slug', 'wordpress-importer' );
-			echo '<br />';
-			return;
-		}
-
-		$menu_id = term_exists( $menu_slug, 'nav_menu' );
-		if ( ! $menu_id ) {
-			printf( __( 'Menu item skipped due to invalid menu slug: %s', 'wordpress-importer' ), esc_html( $menu_slug ) );
-			echo '<br />';
-			return;
-		} else {
-			$menu_id = is_array( $menu_id ) ? $menu_id['term_id'] : $menu_id;
-		}
-
-		foreach ( $item['postmeta'] as $meta ) {
-					$$meta['key'] = $meta['value'];
-		}
-
-		if ( 'taxonomy' == $_menu_item_type && isset( $this->processed_terms[intval($_menu_item_object_id)] ) ) {
-			$_menu_item_object_id = $this->processed_terms[intval($_menu_item_object_id)];
-		} else if ( 'post_type' == $_menu_item_type && isset( $this->processed_posts[intval($_menu_item_object_id)] ) ) {
-			$_menu_item_object_id = $this->processed_posts[intval($_menu_item_object_id)];
-		} else if ( 'custom' != $_menu_item_type ) {
-			// associated object is missing or not imported yet, we'll retry later
-			$this->missing_menu_items[] = $item;
-			return;
-		}
-
-		if ( isset( $this->processed_menu_items[intval($_menu_item_menu_item_parent)] ) ) {
-			$_menu_item_menu_item_parent = $this->processed_menu_items[intval($_menu_item_menu_item_parent)];
-		} else if ( $_menu_item_menu_item_parent ) {
-			$this->menu_item_orphans[intval($item['post_id'])] = (int) $_menu_item_menu_item_parent;
-			$_menu_item_menu_item_parent = 0;
-		}
-
-		// wp_update_nav_menu_item expects CSS classes as a space separated string
-		$_menu_item_classes = maybe_unserialize( $_menu_item_classes );
-		if ( is_array( $_menu_item_classes ) ) {
-					$_menu_item_classes = implode( ' ', $_menu_item_classes );
-		}
-
-		$args = array(
-			'menu-item-object-id' => $_menu_item_object_id,
-			'menu-item-object' => $_menu_item_object,
-			'menu-item-parent-id' => $_menu_item_menu_item_parent,
-			'menu-item-position' => intval( $item['menu_order'] ),
-			'menu-item-type' => $_menu_item_type,
-			'menu-item-title' => $item['post_title'],
-			'menu-item-url' => $_menu_item_url,
-			'menu-item-description' => $item['post_content'],
-			'menu-item-attr-title' => $item['post_excerpt'],
-			'menu-item-target' => $_menu_item_target,
-			'menu-item-classes' => $_menu_item_classes,
-			'menu-item-xfn' => $_menu_item_xfn,
-			'menu-item-status' => $item['status']
-		);
-
-		$id = wp_update_nav_menu_item( $menu_id, 0, $args );
-		if ( $id && ! is_wp_error( $id ) ) {
-					$this->processed_menu_items[intval($item['post_id'])] = (int) $id;
-		}
-	}
-
-	/**
-	 * If fetching attachments is enabled then attempt to create a new attachment
-	 *
-	 * @param array $post Attachment post details from WXR
-	 * @param string $url URL to fetch attachment from
-	 * @return int|WP_Error Post ID on success, WP_Error otherwise
-	 */
-	function process_attachment( $post, $url ) {
-		if ( ! $this->fetch_attachments ) {
-					return new WP_Error( 'attachment_processing_error',
-				__( 'Fetching attachments is not enabled', 'wordpress-importer' ) );
-		}
-
-		// if the URL is absolute, but does not contain address, then upload it assuming base_site_url
-		if ( preg_match( '|^/[\w\W]+$|', $url ) ) {
-					$url = rtrim( $this->base_url, '/' ) . $url;
-		}
-
-		$upload = $this->fetch_remote_file( $url, $post );
-		if ( is_wp_error( $upload ) ) {
-					return $upload;
-		}
-
-		if ( $info = wp_check_filetype( $upload['file'] ) ) {
-					$post['post_mime_type'] = $info['type'];
-		} else {
-					return new WP_Error( 'attachment_processing_error', __('Invalid file type', 'wordpress-importer') );
-		}
-
-		$post['guid'] = $upload['url'];
-
-		// as per wp-admin/includes/upload.php
-		$post_id = wp_insert_attachment( $post, $upload['file'] );
-		wp_update_attachment_metadata( $post_id, wp_generate_attachment_metadata( $post_id, $upload['file'] ) );
-
-		// remap resized image URLs, works by stripping the extension and remapping the URL stub.
-		if ( preg_match( '!^image/!', $info['type'] ) ) {
-			$parts = pathinfo( $url );
-			$name = basename( $parts['basename'], ".{$parts['extension']}" ); // PATHINFO_FILENAME in PHP 5.2
-
-			$parts_new = pathinfo( $upload['url'] );
-			$name_new = basename( $parts_new['basename'], ".{$parts_new['extension']}" );
-
-			$this->url_remap[$parts['dirname'] . '/' . $name] = $parts_new['dirname'] . '/' . $name_new;
-		}
-
-		return $post_id;
-	}
-
-	/**
-	 * Attempt to download a remote file attachment
-	 *
-	 * @param string $url URL of item to fetch
-	 * @param array $post Attachment details
-	 * @return array|WP_Error Local file location details on success, WP_Error otherwise
-	 */
-	function fetch_remote_file( $url, $post ) {
-		// extract the file name and extension from the url
-		$file_name = basename( $url );
-
-		// get placeholder file in the upload dir with a unique, sanitized filename
-		$upload = wp_upload_bits( $file_name, 0, '', $post['upload_date'] );
-		if ( $upload['error'] ) {
-					return new WP_Error( 'upload_dir_error', $upload['error'] );
-		}
-
-		// fetch the remote url and write it to the placeholder file
-		$headers = wp_get_http( $url, $upload['file'] );
-
-		// request failed
-		if ( ! $headers ) {
-			@unlink( $upload['file'] );
-			return new WP_Error( 'import_file_error', __('Remote server did not respond', 'wordpress-importer') );
-		}
-
-		// make sure the fetch was successful
-		if ( $headers['response'] != '200' ) {
-			@unlink( $upload['file'] );
-			return new WP_Error( 'import_file_error', sprintf( __('Remote server returned error response %1$d %2$s', 'wordpress-importer'), esc_html($headers['response']), get_status_header_desc($headers['response']) ) );
-		}
-
-		$filesize = filesize( $upload['file'] );
-
-		if ( isset( $headers['content-length'] ) && $filesize != $headers['content-length'] ) {
-			@unlink( $upload['file'] );
-			return new WP_Error( 'import_file_error', __('Remote file is incorrect size', 'wordpress-importer') );
-		}
-
-		if ( 0 == $filesize ) {
-			@unlink( $upload['file'] );
-			return new WP_Error( 'import_file_error', __('Zero size file downloaded', 'wordpress-importer') );
-		}
-
-		$max_size = (int) $this->max_attachment_size();
-		if ( ! empty( $max_size ) && $filesize > $max_size ) {
-			@unlink( $upload['file'] );
-			return new WP_Error( 'import_file_error', sprintf(__('Remote file is too large, limit is %s', 'wordpress-importer'), size_format($max_size) ) );
-		}
-
-		// keep track of the old and new urls so we can substitute them later
-		$this->url_remap[$url] = $upload['url'];
-		$this->url_remap[$post['guid']] = $upload['url']; // r13735, really needed?
-		// keep track of the destination if the remote url is redirected somewhere else
-		if ( isset($headers['x-final-location']) && $headers['x-final-location'] != $url ) {
-					$this->url_remap[$headers['x-final-location']] = $upload['url'];
-		}
-
-		return $upload;
-	}
-
-	/**
-	 * Attempt to associate posts and menu items with previously missing parents
-	 *
-	 * An imported post's parent may not have been imported when it was first created
-	 * so try again. Similarly for child menu items and menu items which were missing
-	 * the object (e.g. post) they represent in the menu
-	 */
-	function backfill_parents() {
-		global $wpdb;
-
-		// find parents for post orphans
-		foreach ( $this->post_orphans as $child_id => $parent_id ) {
-			$local_child_id = $local_parent_id = false;
-			if ( isset( $this->processed_posts[$child_id] ) ) {
-							$local_child_id = $this->processed_posts[$child_id];
-			}
-			if ( isset( $this->processed_posts[$parent_id] ) ) {
-							$local_parent_id = $this->processed_posts[$parent_id];
-			}
-
-			if ( $local_child_id && $local_parent_id ) {
-							$wpdb->update( $wpdb->posts, array( 'post_parent' => $local_parent_id ), array( 'ID' => $local_child_id ), '%d', '%d' );
-			}
-		}
-
-		// all other posts/terms are imported, retry menu items with missing associated object
-		$missing_menu_items = $this->missing_menu_items;
-		foreach ( $missing_menu_items as $item ) {
-					$this->process_menu_item( $item );
-		}
-
-		// find parents for menu item orphans
-		foreach ( $this->menu_item_orphans as $child_id => $parent_id ) {
-			$local_child_id = $local_parent_id = 0;
-			if ( isset( $this->processed_menu_items[$child_id] ) ) {
-							$local_child_id = $this->processed_menu_items[$child_id];
-			}
-			if ( isset( $this->processed_menu_items[$parent_id] ) ) {
-							$local_parent_id = $this->processed_menu_items[$parent_id];
-			}
-
-			if ( $local_child_id && $local_parent_id ) {
-							update_post_meta( $local_child_id, '_menu_item_menu_item_parent', (int) $local_parent_id );
-			}
-		}
-	}
-
-	/**
-	 * Use stored mapping information to update old attachment URLs
-	 */
-	function backfill_attachment_urls() {
-		global $wpdb;
-		// make sure we do the longest urls first, in case one is a substring of another
-		uksort( $this->url_remap, array(&$this, 'cmpr_strlen') );
-
-		foreach ( $this->url_remap as $from_url => $to_url ) {
-			// remap urls in post_content
-			$wpdb->query( $wpdb->prepare("UPDATE {$wpdb->posts} SET post_content = REPLACE(post_content, %s, %s)", $from_url, $to_url) );
-			// remap enclosure urls
-			$result = $wpdb->query( $wpdb->prepare("UPDATE {$wpdb->postmeta} SET meta_value = REPLACE(meta_value, %s, %s) WHERE meta_key='enclosure'", $from_url, $to_url) );
-		}
-	}
-
-	/**
-	 * Update _thumbnail_id meta to new, imported attachment IDs
-	 */
-	function remap_featured_images() {
-		// cycle through posts that have a featured image
-		foreach ( $this->featured_images as $post_id => $value ) {
-			if ( isset( $this->processed_posts[$value] ) ) {
-				$new_id = $this->processed_posts[$value];
-				// only update if there's a difference
-				if ( $new_id != $value ) {
-									update_post_meta( $post_id, '_thumbnail_id', $new_id );
-				}
-			}
-		}
-	}
-
-	/**
-	 * Parse a WXR file
-	 *
-	 * @param string $file Path to WXR file for parsing
-	 * @return array Information gathered from the WXR file
-	 */
-	function parse( $file ) {
-		$parser = new WXR_Parser();
-		return $parser->parse( $file );
-	}
-
-	// Display import page title
-	function header() {
-		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 of this importer is available. Please update to version %s to ensure compatibility with newer export files.', 'wordpress-importer' ), $update->update->new_version );
-			echo '</strong></p></div>';
-		}
-	}
-
-	// Close div.wrap
-	function footer() {
-		echo '</div>';
-	}
-
-	/**
-	 * Display introductory text and file upload form
-	 */
-	function greet() {
-		echo '<div class="narrow">';
-		echo '<p>'.__( 'Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, pages, comments, custom fields, categories, and tags into this site.', 'wordpress-importer' ).'</p>';
-		echo '<p>'.__( 'Choose a WXR (.xml) file to upload, then click Upload file and import.', 'wordpress-importer' ).'</p>';
-		wp_import_upload_form( 'admin.php?import=wordpress&amp;step=1' );
-		echo '</div>';
-	}
-
-	/**
-	 * Decide if the given meta key maps to information we will want to import
-	 *
-	 * @param string $key The meta key to check
-	 * @return string|bool The key if we do want to import, false if not
-	 */
-	function is_valid_meta_key( $key ) {
-		// skip attachment metadata since we'll regenerate it from scratch
-		// skip _edit_lock as not relevant for import
-		if ( in_array( $key, array( '_wp_attached_file', '_wp_attachment_metadata', '_edit_lock' ) ) ) {
-					return false;
-		}
-		return $key;
-	}
-
-	/**
-	 * Decide whether or not the importer is allowed to create users.
-	 * Default is true, can be filtered via import_allow_create_users
-	 *
-	 * @return bool True if creating users is allowed
-	 */
-	function allow_create_users() {
-		return apply_filters( 'import_allow_create_users', true );
-	}
-
-	/**
-	 * Decide whether or not the importer should attempt to download attachment files.
-	 * Default is true, can be filtered via import_allow_fetch_attachments. The choice
-	 * made at the import options screen must also be true, false here hides that checkbox.
-	 *
-	 * @return bool True if downloading attachments is allowed
-	 */
-	function allow_fetch_attachments() {
-		return apply_filters( 'import_allow_fetch_attachments', true );
-	}
-
-	/**
-	 * Decide what the maximum file size for downloaded attachments is.
-	 * Default is 0 (unlimited), can be filtered via import_attachment_size_limit
-	 *
-	 * @return int Maximum attachment file size to import
-	 */
-	function max_attachment_size() {
-		return apply_filters( 'import_attachment_size_limit', 0 );
-	}
-
-	/**
-	 * Added to http_request_timeout filter to force timeout at 60 seconds during import
-	 * @return int 60
-	 */
-	function bump_request_timeout( $val ) {
-		return 60;
-	}
-
-	// return the difference in length between two strings
-	function cmpr_strlen( $a, $b ) {
-		return strlen($b) - strlen($a);
-	}
+    }
+
+    /**
+     * Display import options for an individual author. That is, either create
+     * a new user based on import info or map to an existing user
+     *
+     * @param int $n Index for each author in the form
+     * @param array $author Author information, e.g. login, display name, email
+     */
+    function author_select( $n, $author ) {
+        _e( 'Import author:', 'wordpress-importer' );
+        echo ' <strong>' . esc_html( $author['author_display_name'] );
+        if ( $this->version != '1.0' ) {
+            echo ' (' . esc_html( $author['author_login'] ) . ')';
+        }
+        echo '</strong><br />';
+
+        if ( $this->version != '1.0' ) {
+                    echo '<div style="margin-left:18px">';
+        }
+
+        $create_users = $this->allow_create_users();
+        if ( $create_users ) {
+            if ( $this->version != '1.0' ) {
+                _e( 'or create new user with login name:', 'wordpress-importer' );
+                $value = '';
+            } else {
+                _e( 'as a new user:', 'wordpress-importer' );
+                $value = esc_attr( sanitize_user( $author['author_login'], true ) );
+            }
+
+            echo ' <input type="text" name="user_new['.$n.']" value="'. $value .'" /><br />';
+        }
+
+        if ( ! $create_users && $this->version == '1.0' ) {
+                    _e( 'assign posts to an existing user:', 'wordpress-importer' );
+        } else {
+                    _e( 'or assign posts to an existing user:', 'wordpress-importer' );
+        }
+        wp_dropdown_users( array( 'name' => "user_map[$n]", 'multi' => true, 'show_option_all' => __( '- Select -', 'wordpress-importer' ) ) );
+        echo '<input type="hidden" name="imported_authors['.$n.']" value="' . esc_attr( $author['author_login'] ) . '" />';
+
+        if ( $this->version != '1.0' ) {
+                    echo '</div>';
+        }
+    }
+
+    /**
+     * Map old author logins to local user IDs based on decisions made
+     * in import options form. Can map to an existing user, create a new user
+     * or falls back to the current user in case of error with either of the previous
+     */
+    function get_author_mapping() {
+        if ( ! isset( $_POST['imported_authors'] ) ) {
+                    return;
+        }
+
+        $create_users = $this->allow_create_users();
+
+        foreach ( (array) $_POST['imported_authors'] as $i => $old_login ) {
+            // Multisite adds strtolower to sanitize_user. Need to sanitize here to stop breakage in process_posts.
+            $santized_old_login = sanitize_user( $old_login, true );
+            $old_id = isset( $this->authors[$old_login]['author_id'] ) ? intval($this->authors[$old_login]['author_id']) : false;
+
+            if ( ! empty( $_POST['user_map'][$i] ) ) {
+                $user = get_userdata( intval($_POST['user_map'][$i]) );
+                if ( isset( $user->ID ) ) {
+                    if ( $old_id ) {
+                                            $this->processed_authors[$old_id] = $user->ID;
+                    }
+                    $this->author_mapping[$santized_old_login] = $user->ID;
+                }
+            } else if ( $create_users ) {
+                if ( ! empty($_POST['user_new'][$i]) ) {
+                    $user_id = wp_create_user( $_POST['user_new'][$i], wp_generate_password() );
+                } else if ( $this->version != '1.0' ) {
+                    $user_data = array(
+                        'user_login' => $old_login,
+                        'user_pass' => wp_generate_password(),
+                        'user_email' => isset( $this->authors[$old_login]['author_email'] ) ? $this->authors[$old_login]['author_email'] : '',
+                        'display_name' => $this->authors[$old_login]['author_display_name'],
+                        'first_name' => isset( $this->authors[$old_login]['author_first_name'] ) ? $this->authors[$old_login]['author_first_name'] : '',
+                        'last_name' => isset( $this->authors[$old_login]['author_last_name'] ) ? $this->authors[$old_login]['author_last_name'] : '',
+                    );
+                    $user_id = wp_insert_user( $user_data );
+                }
+
+                if ( ! is_wp_error( $user_id ) ) {
+                    if ( $old_id ) {
+                                            $this->processed_authors[$old_id] = $user_id;
+                    }
+                    $this->author_mapping[$santized_old_login] = $user_id;
+                } else {
+                    printf( __( 'Failed to create new user for %s. Their posts will be attributed to the current user.', 'wordpress-importer' ), esc_html($this->authors[$old_login]['author_display_name']) );
+                    if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+                                            echo ' ' . $user_id->get_error_message();
+                    }
+                    echo '<br />';
+                }
+            }
+
+            // failsafe: if the user_id was invalid, default to the current user
+            if ( ! isset( $this->author_mapping[$santized_old_login] ) ) {
+                if ( $old_id ) {
+                                    $this->processed_authors[$old_id] = (int) get_current_user_id();
+                }
+                $this->author_mapping[$santized_old_login] = (int) get_current_user_id();
+            }
+        }
+    }
+
+    /**
+     * Create new categories based on import information
+     *
+     * Doesn't create a new category if its slug already exists
+     */
+    function process_categories() {
+        $this->categories = apply_filters( 'wp_import_categories', $this->categories );
+
+        if ( empty( $this->categories ) ) {
+                    return;
+        }
+
+        foreach ( $this->categories as $cat ) {
+            // if the category already exists leave it alone
+            $term_id = term_exists( $cat['category_nicename'], 'category' );
+            if ( $term_id ) {
+                if ( is_array($term_id) ) {
+                    $term_id = $term_id['term_id'];
+                }
+                if ( isset($cat['term_id']) ) {
+                                    $this->processed_terms[intval($cat['term_id'])] = (int) $term_id;
+                }
+                continue;
+            }
+
+            $category_parent = empty( $cat['category_parent'] ) ? 0 : category_exists( $cat['category_parent'] );
+            $category_description = isset( $cat['category_description'] ) ? $cat['category_description'] : '';
+            $catarr = array(
+                'category_nicename' => $cat['category_nicename'],
+                'category_parent' => $category_parent,
+                'cat_name' => $cat['cat_name'],
+                'category_description' => $category_description
+            );
+            $catarr = wp_slash( $catarr );
+
+            $id = wp_insert_category( $catarr );
+            if ( ! is_wp_error( $id ) ) {
+                if ( isset($cat['term_id']) ) {
+                                    $this->processed_terms[intval($cat['term_id'])] = $id;
+                }
+            } else {
+                printf( __( 'Failed to import category %s', 'wordpress-importer' ), esc_html($cat['category_nicename']) );
+                if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+                                    echo ': ' . $id->get_error_message();
+                }
+                echo '<br />';
+                continue;
+            }
+
+            $this->process_termmeta( $cat, $id['term_id'] );
+        }
+
+        unset( $this->categories );
+    }
+
+    /**
+     * Create new post tags based on import information
+     *
+     * Doesn't create a tag if its slug already exists
+     */
+    function process_tags() {
+        $this->tags = apply_filters( 'wp_import_tags', $this->tags );
+
+        if ( empty( $this->tags ) ) {
+                    return;
+        }
+
+        foreach ( $this->tags as $tag ) {
+            // if the tag already exists leave it alone
+            $term_id = term_exists( $tag['tag_slug'], 'post_tag' );
+            if ( $term_id ) {
+                if ( is_array($term_id) ) {
+                    $term_id = $term_id['term_id'];
+                }
+                if ( isset($tag['term_id']) ) {
+                                    $this->processed_terms[intval($tag['term_id'])] = (int) $term_id;
+                }
+                continue;
+            }
+
+            $tag = wp_slash( $tag );
+            $tag_desc = isset( $tag['tag_description'] ) ? $tag['tag_description'] : '';
+            $tagarr = array( 'slug' => $tag['tag_slug'], 'description' => $tag_desc );
+
+            $id = wp_insert_term( $tag['tag_name'], 'post_tag', $tagarr );
+            if ( ! is_wp_error( $id ) ) {
+                if ( isset($tag['term_id']) ) {
+                                    $this->processed_terms[intval($tag['term_id'])] = $id['term_id'];
+                }
+            } else {
+                printf( __( 'Failed to import post tag %s', 'wordpress-importer' ), esc_html($tag['tag_name']) );
+                if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+                                    echo ': ' . $id->get_error_message();
+                }
+                echo '<br />';
+                continue;
+            }
+
+            $this->process_termmeta( $tag, $id['term_id'] );
+        }
+
+        unset( $this->tags );
+    }
+
+    /**
+     * Create new terms based on import information
+     *
+     * Doesn't create a term its slug already exists
+     */
+    function process_terms() {
+        $this->terms = apply_filters( 'wp_import_terms', $this->terms );
+
+        if ( empty( $this->terms ) ) {
+                    return;
+        }
+
+        foreach ( $this->terms as $term ) {
+            // if the term already exists in the correct taxonomy leave it alone
+            $term_id = term_exists( $term['slug'], $term['term_taxonomy'] );
+            if ( $term_id ) {
+                if ( is_array($term_id) ) {
+                    $term_id = $term_id['term_id'];
+                }
+                if ( isset($term['term_id']) ) {
+                                    $this->processed_terms[intval($term['term_id'])] = (int) $term_id;
+                }
+                continue;
+            }
+
+            if ( empty( $term['term_parent'] ) ) {
+                $parent = 0;
+            } else {
+                $parent = term_exists( $term['term_parent'], $term['term_taxonomy'] );
+                if ( is_array( $parent ) ) {
+                    $parent = $parent['term_id'];
+                }
+            }
+            $term = wp_slash( $term );
+            $description = isset( $term['term_description'] ) ? $term['term_description'] : '';
+            $termarr = array( 'slug' => $term['slug'], 'description' => $description, 'parent' => intval($parent) );
+
+            $id = wp_insert_term( $term['term_name'], $term['term_taxonomy'], $termarr );
+            if ( ! is_wp_error( $id ) ) {
+                if ( isset($term['term_id']) ) {
+                                    $this->processed_terms[intval($term['term_id'])] = $id['term_id'];
+                }
+            } else {
+                printf( __( 'Failed to import %s %s', 'wordpress-importer' ), esc_html($term['term_taxonomy']), esc_html($term['term_name']) );
+                if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+                                    echo ': ' . $id->get_error_message();
+                }
+                echo '<br />';
+                continue;
+            }
+
+            $this->process_termmeta( $term, $id['term_id'] );
+        }
+
+        unset( $this->terms );
+    }
+
+    /**
+     * Add metadata to imported term.
+     *
+     * @since 0.6.2
+     *
+     * @param array $term    Term data from WXR import.
+     * @param int   $term_id ID of the newly created term.
+     */
+    protected function process_termmeta( $term, $term_id ) {
+        if ( ! isset( $term['termmeta'] ) ) {
+            $term['termmeta'] = array();
+        }
+
+        /**
+         * Filters the metadata attached to an imported term.
+         *
+         * @since 0.6.2
+         *
+         * @param array $termmeta Array of term meta.
+         * @param int   $term_id  ID of the newly created term.
+         * @param array $term     Term data from the WXR import.
+         */
+        $term['termmeta'] = apply_filters( 'wp_import_term_meta', $term['termmeta'], $term_id, $term );
+
+        if ( empty( $term['termmeta'] ) ) {
+            return;
+        }
+
+        foreach ( $term['termmeta'] as $meta ) {
+            /**
+             * Filters the meta key for an imported piece of term meta.
+             *
+             * @since 0.6.2
+             *
+             * @param string $meta_key Meta key.
+             * @param int    $term_id  ID of the newly created term.
+             * @param array  $term     Term data from the WXR import.
+             */
+            $key = apply_filters( 'import_term_meta_key', $meta['key'], $term_id, $term );
+            if ( ! $key ) {
+                continue;
+            }
+
+            // Export gets meta straight from the DB so could have a serialized string
+            $value = maybe_unserialize( $meta['value'] );
+
+            add_term_meta( $term_id, $key, $value );
+
+            /**
+             * Fires after term meta is imported.
+             *
+             * @since 0.6.2
+             *
+             * @param int    $term_id ID of the newly created term.
+             * @param string $key     Meta key.
+             * @param mixed  $value   Meta value.
+             */
+            do_action( 'import_term_meta', $term_id, $key, $value );
+        }
+    }
+
+    /**
+     * Create new posts based on import information
+     *
+     * Posts marked as having a parent which doesn't exist will become top level items.
+     * Doesn't create a new post if: the post type doesn't exist, the given post ID
+     * is already noted as imported or a post with the same title and date already exists.
+     * Note that new/updated terms, comments and meta are imported for the last of the above.
+     */
+    function process_posts() {
+        $this->posts = apply_filters( 'wp_import_posts', $this->posts );
+
+        foreach ( $this->posts as $post ) {
+            $post = apply_filters( 'wp_import_post_data_raw', $post );
+
+            if ( ! post_type_exists( $post['post_type'] ) ) {
+                printf( __( 'Failed to import &#8220;%s&#8221;: Invalid post type %s', 'wordpress-importer' ),
+                    esc_html($post['post_title']), esc_html($post['post_type']) );
+                echo '<br />';
+                do_action( 'wp_import_post_exists', $post );
+                continue;
+            }
+
+            if ( isset( $this->processed_posts[$post['post_id']] ) && ! empty( $post['post_id'] ) ) {
+                            continue;
+            }
+
+            if ( $post['status'] == 'auto-draft' ) {
+                            continue;
+            }
+
+            if ( 'nav_menu_item' == $post['post_type'] ) {
+                $this->process_menu_item( $post );
+                continue;
+            }
+
+            $post_type_object = get_post_type_object( $post['post_type'] );
+
+            $post_exists = post_exists( $post['post_title'], '', $post['post_date'] );
+
+            /**
+             * Filter ID of the existing post corresponding to post currently importing.
+             *
+             * Return 0 to force the post to be imported. Filter the ID to be something else
+             * to override which existing post is mapped to the imported post.
+             *
+             * @see post_exists()
+             * @since 0.6.2
+             *
+             * @param int   $post_exists  Post ID, or 0 if post did not exist.
+             * @param array $post         The post array to be inserted.
+             */
+            $post_exists = apply_filters( 'wp_import_existing_post', $post_exists, $post );
+
+            if ( $post_exists && get_post_type( $post_exists ) == $post['post_type'] ) {
+                printf( __('%s &#8220;%s&#8221; already exists.', 'wordpress-importer'), $post_type_object->labels->singular_name, esc_html($post['post_title']) );
+                echo '<br />';
+                $comment_post_ID = $post_id = $post_exists;
+                $this->processed_posts[ intval( $post['post_id'] ) ] = intval( $post_exists );
+            } else {
+                $post_parent = (int) $post['post_parent'];
+                if ( $post_parent ) {
+                    // if we already know the parent, map it to the new local ID
+                    if ( isset( $this->processed_posts[$post_parent] ) ) {
+                        $post_parent = $this->processed_posts[$post_parent];
+                    // otherwise record the parent for later
+                    } else {
+                        $this->post_orphans[intval($post['post_id'])] = $post_parent;
+                        $post_parent = 0;
+                    }
+                }
+
+                // map the post author
+                $author = sanitize_user( $post['post_author'], true );
+                if ( isset( $this->author_mapping[$author] ) ) {
+                                    $author = $this->author_mapping[$author];
+                } else {
+                                    $author = (int) get_current_user_id();
+                }
+
+                $postdata = array(
+                    'import_id' => $post['post_id'], 'post_author' => $author, 'post_date' => $post['post_date'],
+                    'post_date_gmt' => $post['post_date_gmt'], 'post_content' => $post['post_content'],
+                    'post_excerpt' => $post['post_excerpt'], 'post_title' => $post['post_title'],
+                    'post_status' => $post['status'], 'post_name' => $post['post_name'],
+                    'comment_status' => $post['comment_status'], 'ping_status' => $post['ping_status'],
+                    'guid' => $post['guid'], 'post_parent' => $post_parent, 'menu_order' => $post['menu_order'],
+                    'post_type' => $post['post_type'], 'post_password' => $post['post_password']
+                );
+
+                $original_post_ID = $post['post_id'];
+                $postdata = apply_filters( 'wp_import_post_data_processed', $postdata, $post );
+
+                $postdata = wp_slash( $postdata );
+
+                if ( 'attachment' == $postdata['post_type'] ) {
+                    $remote_url = ! empty($post['attachment_url']) ? $post['attachment_url'] : $post['guid'];
+
+                    // try to use _wp_attached file for upload folder placement to ensure the same location as the export site
+                    // e.g. location is 2003/05/image.jpg but the attachment post_date is 2010/09, see media_handle_upload()
+                    $postdata['upload_date'] = $post['post_date'];
+                    if ( isset( $post['postmeta'] ) ) {
+                        foreach( $post['postmeta'] as $meta ) {
+                            if ( $meta['key'] == '_wp_attached_file' ) {
+                                if ( preg_match( '%^[0-9]{4}/[0-9]{2}%', $meta['value'], $matches ) ) {
+                                                                    $postdata['upload_date'] = $matches[0];
+                                }
+                                break;
+                            }
+                        }
+                    }
+
+                    $comment_post_ID = $post_id = $this->process_attachment( $postdata, $remote_url );
+                } else {
+                    $comment_post_ID = $post_id = wp_insert_post( $postdata, true );
+                    do_action( 'wp_import_insert_post', $post_id, $original_post_ID, $postdata, $post );
+                }
+
+                if ( is_wp_error( $post_id ) ) {
+                    printf( __( 'Failed to import %s &#8220;%s&#8221;', 'wordpress-importer' ),
+                        $post_type_object->labels->singular_name, esc_html($post['post_title']) );
+                    if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+                                            echo ': ' . $post_id->get_error_message();
+                    }
+                    echo '<br />';
+                    continue;
+                }
+
+                if ( $post['is_sticky'] == 1 ) {
+                                    stick_post( $post_id );
+                }
+            }
+
+            // map pre-import ID to local ID
+            $this->processed_posts[intval($post['post_id'])] = (int) $post_id;
+
+            if ( ! isset( $post['terms'] ) ) {
+                            $post['terms'] = array();
+            }
+
+            $post['terms'] = apply_filters( 'wp_import_post_terms', $post['terms'], $post_id, $post );
+
+            // add categories, tags and other terms
+            if ( ! empty( $post['terms'] ) ) {
+                $terms_to_set = array();
+                foreach ( $post['terms'] as $term ) {
+                    // back compat with WXR 1.0 map 'tag' to 'post_tag'
+                    $taxonomy = ( 'tag' == $term['domain'] ) ? 'post_tag' : $term['domain'];
+                    $term_exists = term_exists( $term['slug'], $taxonomy );
+                    $term_id = is_array( $term_exists ) ? $term_exists['term_id'] : $term_exists;
+                    if ( ! $term_id ) {
+                        $t = wp_insert_term( $term['name'], $taxonomy, array( 'slug' => $term['slug'] ) );
+                        if ( ! is_wp_error( $t ) ) {
+                            $term_id = $t['term_id'];
+                            do_action( 'wp_import_insert_term', $t, $term, $post_id, $post );
+                        } else {
+                            printf( __( 'Failed to import %s %s', 'wordpress-importer' ), esc_html($taxonomy), esc_html($term['name']) );
+                            if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+                                                            echo ': ' . $t->get_error_message();
+                            }
+                            echo '<br />';
+                            do_action( 'wp_import_insert_term_failed', $t, $term, $post_id, $post );
+                            continue;
+                        }
+                    }
+                    $terms_to_set[$taxonomy][] = intval( $term_id );
+                }
+
+                foreach ( $terms_to_set as $tax => $ids ) {
+                    $tt_ids = wp_set_post_terms( $post_id, $ids, $tax );
+                    do_action( 'wp_import_set_post_terms', $tt_ids, $ids, $tax, $post_id, $post );
+                }
+                unset( $post['terms'], $terms_to_set );
+            }
+
+            if ( ! isset( $post['comments'] ) ) {
+                            $post['comments'] = array();
+            }
+
+            $post['comments'] = apply_filters( 'wp_import_post_comments', $post['comments'], $post_id, $post );
+
+            // add/update comments
+            if ( ! empty( $post['comments'] ) ) {
+                $num_comments = 0;
+                $inserted_comments = array();
+                foreach ( $post['comments'] as $comment ) {
+                    $comment_id	= $comment['comment_id'];
+                    $newcomments[$comment_id]['comment_post_ID']      = $comment_post_ID;
+                    $newcomments[$comment_id]['comment_author']       = $comment['comment_author'];
+                    $newcomments[$comment_id]['comment_author_email'] = $comment['comment_author_email'];
+                    $newcomments[$comment_id]['comment_author_IP']    = $comment['comment_author_IP'];
+                    $newcomments[$comment_id]['comment_author_url']   = $comment['comment_author_url'];
+                    $newcomments[$comment_id]['comment_date']         = $comment['comment_date'];
+                    $newcomments[$comment_id]['comment_date_gmt']     = $comment['comment_date_gmt'];
+                    $newcomments[$comment_id]['comment_content']      = $comment['comment_content'];
+                    $newcomments[$comment_id]['comment_approved']     = $comment['comment_approved'];
+                    $newcomments[$comment_id]['comment_type']         = $comment['comment_type'];
+                    $newcomments[$comment_id]['comment_parent'] 	  = $comment['comment_parent'];
+                    $newcomments[$comment_id]['commentmeta']          = isset( $comment['commentmeta'] ) ? $comment['commentmeta'] : array();
+                    if ( isset( $this->processed_authors[$comment['comment_user_id']] ) ) {
+                                            $newcomments[$comment_id]['user_id'] = $this->processed_authors[$comment['comment_user_id']];
+                    }
+                }
+                ksort( $newcomments );
+
+                foreach ( $newcomments as $key => $comment ) {
+                    // if this is a new post we can skip the comment_exists() check
+                    if ( ! $post_exists || ! comment_exists( $comment['comment_author'], $comment['comment_date'] ) ) {
+                        if ( isset( $inserted_comments[$comment['comment_parent']] ) ) {
+                                                    $comment['comment_parent'] = $inserted_comments[$comment['comment_parent']];
+                        }
+                        $comment = wp_filter_comment( $comment );
+                        $inserted_comments[$key] = wp_insert_comment( $comment );
+                        do_action( 'wp_import_insert_comment', $inserted_comments[$key], $comment, $comment_post_ID, $post );
+
+                        foreach( $comment['commentmeta'] as $meta ) {
+                            $value = maybe_unserialize( $meta['value'] );
+                            add_comment_meta( $inserted_comments[$key], $meta['key'], $value );
+                        }
+
+                        $num_comments++;
+                    }
+                }
+                unset( $newcomments, $inserted_comments, $post['comments'] );
+            }
+
+            if ( ! isset( $post['postmeta'] ) ) {
+                            $post['postmeta'] = array();
+            }
+
+            $post['postmeta'] = apply_filters( 'wp_import_post_meta', $post['postmeta'], $post_id, $post );
+
+            // add/update post meta
+            if ( ! empty( $post['postmeta'] ) ) {
+                foreach ( $post['postmeta'] as $meta ) {
+                    $key = apply_filters( 'import_post_meta_key', $meta['key'], $post_id, $post );
+                    $value = false;
+
+                    if ( '_edit_last' == $key ) {
+                        if ( isset( $this->processed_authors[intval($meta['value'])] ) ) {
+                                                    $value = $this->processed_authors[intval($meta['value'])];
+                        } else {
+                                                    $key = false;
+                        }
+                    }
+
+                    if ( $key ) {
+                        // export gets meta straight from the DB so could have a serialized string
+                        if ( ! $value ) {
+                                                    $value = maybe_unserialize( $meta['value'] );
+                        }
+
+                        add_post_meta( $post_id, $key, $value );
+                        do_action( 'import_post_meta', $post_id, $key, $value );
+
+                        // if the post has a featured image, take note of this in case of remap
+                        if ( '_thumbnail_id' == $key ) {
+                                                    $this->featured_images[$post_id] = (int) $value;
+                        }
+                    }
+                }
+            }
+        }
+
+        unset( $this->posts );
+    }
+
+    /**
+     * Attempt to create a new menu item from import data
+     *
+     * Fails for draft, orphaned menu items and those without an associated nav_menu
+     * or an invalid nav_menu term. If the post type or term object which the menu item
+     * represents doesn't exist then the menu item will not be imported (waits until the
+     * end of the import to retry again before discarding).
+     *
+     * @param array $item Menu item details from WXR file
+     */
+    function process_menu_item( $item ) {
+        // skip draft, orphaned menu items
+        if ( 'draft' == $item['status'] ) {
+                    return;
+        }
+
+        $menu_slug = false;
+        if ( isset($item['terms']) ) {
+            // loop through terms, assume first nav_menu term is correct menu
+            foreach ( $item['terms'] as $term ) {
+                if ( 'nav_menu' == $term['domain'] ) {
+                    $menu_slug = $term['slug'];
+                    break;
+                }
+            }
+        }
+
+        // no nav_menu term associated with this menu item
+        if ( ! $menu_slug ) {
+            _e( 'Menu item skipped due to missing menu slug', 'wordpress-importer' );
+            echo '<br />';
+            return;
+        }
+
+        $menu_id = term_exists( $menu_slug, 'nav_menu' );
+        if ( ! $menu_id ) {
+            printf( __( 'Menu item skipped due to invalid menu slug: %s', 'wordpress-importer' ), esc_html( $menu_slug ) );
+            echo '<br />';
+            return;
+        } else {
+            $menu_id = is_array( $menu_id ) ? $menu_id['term_id'] : $menu_id;
+        }
+
+        foreach ( $item['postmeta'] as $meta ) {
+                    $$meta['key'] = $meta['value'];
+        }
+
+        if ( 'taxonomy' == $_menu_item_type && isset( $this->processed_terms[intval($_menu_item_object_id)] ) ) {
+            $_menu_item_object_id = $this->processed_terms[intval($_menu_item_object_id)];
+        } else if ( 'post_type' == $_menu_item_type && isset( $this->processed_posts[intval($_menu_item_object_id)] ) ) {
+            $_menu_item_object_id = $this->processed_posts[intval($_menu_item_object_id)];
+        } else if ( 'custom' != $_menu_item_type ) {
+            // associated object is missing or not imported yet, we'll retry later
+            $this->missing_menu_items[] = $item;
+            return;
+        }
+
+        if ( isset( $this->processed_menu_items[intval($_menu_item_menu_item_parent)] ) ) {
+            $_menu_item_menu_item_parent = $this->processed_menu_items[intval($_menu_item_menu_item_parent)];
+        } else if ( $_menu_item_menu_item_parent ) {
+            $this->menu_item_orphans[intval($item['post_id'])] = (int) $_menu_item_menu_item_parent;
+            $_menu_item_menu_item_parent = 0;
+        }
+
+        // wp_update_nav_menu_item expects CSS classes as a space separated string
+        $_menu_item_classes = maybe_unserialize( $_menu_item_classes );
+        if ( is_array( $_menu_item_classes ) ) {
+                    $_menu_item_classes = implode( ' ', $_menu_item_classes );
+        }
+
+        $args = array(
+            'menu-item-object-id' => $_menu_item_object_id,
+            'menu-item-object' => $_menu_item_object,
+            'menu-item-parent-id' => $_menu_item_menu_item_parent,
+            'menu-item-position' => intval( $item['menu_order'] ),
+            'menu-item-type' => $_menu_item_type,
+            'menu-item-title' => $item['post_title'],
+            'menu-item-url' => $_menu_item_url,
+            'menu-item-description' => $item['post_content'],
+            'menu-item-attr-title' => $item['post_excerpt'],
+            'menu-item-target' => $_menu_item_target,
+            'menu-item-classes' => $_menu_item_classes,
+            'menu-item-xfn' => $_menu_item_xfn,
+            'menu-item-status' => $item['status']
+        );
+
+        $id = wp_update_nav_menu_item( $menu_id, 0, $args );
+        if ( $id && ! is_wp_error( $id ) ) {
+                    $this->processed_menu_items[intval($item['post_id'])] = (int) $id;
+        }
+    }
+
+    /**
+     * If fetching attachments is enabled then attempt to create a new attachment
+     *
+     * @param array $post Attachment post details from WXR
+     * @param string $url URL to fetch attachment from
+     * @return int|WP_Error Post ID on success, WP_Error otherwise
+     */
+    function process_attachment( $post, $url ) {
+        if ( ! $this->fetch_attachments ) {
+                    return new WP_Error( 'attachment_processing_error',
+                __( 'Fetching attachments is not enabled', 'wordpress-importer' ) );
+        }
+
+        // if the URL is absolute, but does not contain address, then upload it assuming base_site_url
+        if ( preg_match( '|^/[\w\W]+$|', $url ) ) {
+                    $url = rtrim( $this->base_url, '/' ) . $url;
+        }
+
+        $upload = $this->fetch_remote_file( $url, $post );
+        if ( is_wp_error( $upload ) ) {
+                    return $upload;
+        }
+
+        if ( $info = wp_check_filetype( $upload['file'] ) ) {
+                    $post['post_mime_type'] = $info['type'];
+        } else {
+                    return new WP_Error( 'attachment_processing_error', __('Invalid file type', 'wordpress-importer') );
+        }
+
+        $post['guid'] = $upload['url'];
+
+        // as per wp-admin/includes/upload.php
+        $post_id = wp_insert_attachment( $post, $upload['file'] );
+        wp_update_attachment_metadata( $post_id, wp_generate_attachment_metadata( $post_id, $upload['file'] ) );
+
+        // remap resized image URLs, works by stripping the extension and remapping the URL stub.
+        if ( preg_match( '!^image/!', $info['type'] ) ) {
+            $parts = pathinfo( $url );
+            $name = basename( $parts['basename'], ".{$parts['extension']}" ); // PATHINFO_FILENAME in PHP 5.2
+
+            $parts_new = pathinfo( $upload['url'] );
+            $name_new = basename( $parts_new['basename'], ".{$parts_new['extension']}" );
+
+            $this->url_remap[$parts['dirname'] . '/' . $name] = $parts_new['dirname'] . '/' . $name_new;
+        }
+
+        return $post_id;
+    }
+
+    /**
+     * Attempt to download a remote file attachment
+     *
+     * @param string $url URL of item to fetch
+     * @param array $post Attachment details
+     * @return array|WP_Error Local file location details on success, WP_Error otherwise
+     */
+    function fetch_remote_file( $url, $post ) {
+        // extract the file name and extension from the url
+        $file_name = basename( $url );
+
+        // get placeholder file in the upload dir with a unique, sanitized filename
+        $upload = wp_upload_bits( $file_name, 0, '', $post['upload_date'] );
+        if ( $upload['error'] ) {
+                    return new WP_Error( 'upload_dir_error', $upload['error'] );
+        }
+
+        // fetch the remote url and write it to the placeholder file
+        $headers = wp_get_http( $url, $upload['file'] );
+
+        // request failed
+        if ( ! $headers ) {
+            @unlink( $upload['file'] );
+            return new WP_Error( 'import_file_error', __('Remote server did not respond', 'wordpress-importer') );
+        }
+
+        // make sure the fetch was successful
+        if ( $headers['response'] != '200' ) {
+            @unlink( $upload['file'] );
+            return new WP_Error( 'import_file_error', sprintf( __('Remote server returned error response %1$d %2$s', 'wordpress-importer'), esc_html($headers['response']), get_status_header_desc($headers['response']) ) );
+        }
+
+        $filesize = filesize( $upload['file'] );
+
+        if ( isset( $headers['content-length'] ) && $filesize != $headers['content-length'] ) {
+            @unlink( $upload['file'] );
+            return new WP_Error( 'import_file_error', __('Remote file is incorrect size', 'wordpress-importer') );
+        }
+
+        if ( 0 == $filesize ) {
+            @unlink( $upload['file'] );
+            return new WP_Error( 'import_file_error', __('Zero size file downloaded', 'wordpress-importer') );
+        }
+
+        $max_size = (int) $this->max_attachment_size();
+        if ( ! empty( $max_size ) && $filesize > $max_size ) {
+            @unlink( $upload['file'] );
+            return new WP_Error( 'import_file_error', sprintf(__('Remote file is too large, limit is %s', 'wordpress-importer'), size_format($max_size) ) );
+        }
+
+        // keep track of the old and new urls so we can substitute them later
+        $this->url_remap[$url] = $upload['url'];
+        $this->url_remap[$post['guid']] = $upload['url']; // r13735, really needed?
+        // keep track of the destination if the remote url is redirected somewhere else
+        if ( isset($headers['x-final-location']) && $headers['x-final-location'] != $url ) {
+                    $this->url_remap[$headers['x-final-location']] = $upload['url'];
+        }
+
+        return $upload;
+    }
+
+    /**
+     * Attempt to associate posts and menu items with previously missing parents
+     *
+     * An imported post's parent may not have been imported when it was first created
+     * so try again. Similarly for child menu items and menu items which were missing
+     * the object (e.g. post) they represent in the menu
+     */
+    function backfill_parents() {
+        global $wpdb;
+
+        // find parents for post orphans
+        foreach ( $this->post_orphans as $child_id => $parent_id ) {
+            $local_child_id = $local_parent_id = false;
+            if ( isset( $this->processed_posts[$child_id] ) ) {
+                            $local_child_id = $this->processed_posts[$child_id];
+            }
+            if ( isset( $this->processed_posts[$parent_id] ) ) {
+                            $local_parent_id = $this->processed_posts[$parent_id];
+            }
+
+            if ( $local_child_id && $local_parent_id ) {
+                            $wpdb->update( $wpdb->posts, array( 'post_parent' => $local_parent_id ), array( 'ID' => $local_child_id ), '%d', '%d' );
+            }
+        }
+
+        // all other posts/terms are imported, retry menu items with missing associated object
+        $missing_menu_items = $this->missing_menu_items;
+        foreach ( $missing_menu_items as $item ) {
+                    $this->process_menu_item( $item );
+        }
+
+        // find parents for menu item orphans
+        foreach ( $this->menu_item_orphans as $child_id => $parent_id ) {
+            $local_child_id = $local_parent_id = 0;
+            if ( isset( $this->processed_menu_items[$child_id] ) ) {
+                            $local_child_id = $this->processed_menu_items[$child_id];
+            }
+            if ( isset( $this->processed_menu_items[$parent_id] ) ) {
+                            $local_parent_id = $this->processed_menu_items[$parent_id];
+            }
+
+            if ( $local_child_id && $local_parent_id ) {
+                            update_post_meta( $local_child_id, '_menu_item_menu_item_parent', (int) $local_parent_id );
+            }
+        }
+    }
+
+    /**
+     * Use stored mapping information to update old attachment URLs
+     */
+    function backfill_attachment_urls() {
+        global $wpdb;
+        // make sure we do the longest urls first, in case one is a substring of another
+        uksort( $this->url_remap, array(&$this, 'cmpr_strlen') );
+
+        foreach ( $this->url_remap as $from_url => $to_url ) {
+            // remap urls in post_content
+            $wpdb->query( $wpdb->prepare("UPDATE {$wpdb->posts} SET post_content = REPLACE(post_content, %s, %s)", $from_url, $to_url) );
+            // remap enclosure urls
+            $result = $wpdb->query( $wpdb->prepare("UPDATE {$wpdb->postmeta} SET meta_value = REPLACE(meta_value, %s, %s) WHERE meta_key='enclosure'", $from_url, $to_url) );
+        }
+    }
+
+    /**
+     * Update _thumbnail_id meta to new, imported attachment IDs
+     */
+    function remap_featured_images() {
+        // cycle through posts that have a featured image
+        foreach ( $this->featured_images as $post_id => $value ) {
+            if ( isset( $this->processed_posts[$value] ) ) {
+                $new_id = $this->processed_posts[$value];
+                // only update if there's a difference
+                if ( $new_id != $value ) {
+                                    update_post_meta( $post_id, '_thumbnail_id', $new_id );
+                }
+            }
+        }
+    }
+
+    /**
+     * Parse a WXR file
+     *
+     * @param string $file Path to WXR file for parsing
+     * @return array Information gathered from the WXR file
+     */
+    function parse( $file ) {
+        $parser = new WXR_Parser();
+        return $parser->parse( $file );
+    }
+
+    // Display import page title
+    function header() {
+        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 of this importer is available. Please update to version %s to ensure compatibility with newer export files.', 'wordpress-importer' ), $update->update->new_version );
+            echo '</strong></p></div>';
+        }
+    }
+
+    // Close div.wrap
+    function footer() {
+        echo '</div>';
+    }
+
+    /**
+     * Display introductory text and file upload form
+     */
+    function greet() {
+        echo '<div class="narrow">';
+        echo '<p>'.__( 'Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, pages, comments, custom fields, categories, and tags into this site.', 'wordpress-importer' ).'</p>';
+        echo '<p>'.__( 'Choose a WXR (.xml) file to upload, then click Upload file and import.', 'wordpress-importer' ).'</p>';
+        wp_import_upload_form( 'admin.php?import=wordpress&amp;step=1' );
+        echo '</div>';
+    }
+
+    /**
+     * Decide if the given meta key maps to information we will want to import
+     *
+     * @param string $key The meta key to check
+     * @return string|bool The key if we do want to import, false if not
+     */
+    function is_valid_meta_key( $key ) {
+        // skip attachment metadata since we'll regenerate it from scratch
+        // skip _edit_lock as not relevant for import
+        if ( in_array( $key, array( '_wp_attached_file', '_wp_attachment_metadata', '_edit_lock' ) ) ) {
+                    return false;
+        }
+        return $key;
+    }
+
+    /**
+     * Decide whether or not the importer is allowed to create users.
+     * Default is true, can be filtered via import_allow_create_users
+     *
+     * @return bool True if creating users is allowed
+     */
+    function allow_create_users() {
+        return apply_filters( 'import_allow_create_users', true );
+    }
+
+    /**
+     * Decide whether or not the importer should attempt to download attachment files.
+     * Default is true, can be filtered via import_allow_fetch_attachments. The choice
+     * made at the import options screen must also be true, false here hides that checkbox.
+     *
+     * @return bool True if downloading attachments is allowed
+     */
+    function allow_fetch_attachments() {
+        return apply_filters( 'import_allow_fetch_attachments', true );
+    }
+
+    /**
+     * Decide what the maximum file size for downloaded attachments is.
+     * Default is 0 (unlimited), can be filtered via import_attachment_size_limit
+     *
+     * @return int Maximum attachment file size to import
+     */
+    function max_attachment_size() {
+        return apply_filters( 'import_attachment_size_limit', 0 );
+    }
+
+    /**
+     * Added to http_request_timeout filter to force timeout at 60 seconds during import
+     * @return int 60
+     */
+    function bump_request_timeout( $val ) {
+        return 60;
+    }
+
+    // return the difference in length between two strings
+    function cmpr_strlen( $a, $b ) {
+        return strlen($b) - strlen($a);
+    }
 }
 
 } // class_exists( 'WP_Importer' )
 
 function wordpress_importer_init() {
-	load_plugin_textdomain( 'wordpress-importer', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
-
-	/**
-	 * WordPress Importer object for registering the import callback
-	 * @global WP_Import $wp_import
-	 */
-	$GLOBALS['wp_import'] = new WP_Import();
-	register_importer( 'wordpress', 'WordPress', __('Import <strong>posts, pages, comments, custom fields, categories, and tags</strong> from a WordPress export file.', 'wordpress-importer'), array( $GLOBALS['wp_import'], 'dispatch' ) );
+    load_plugin_textdomain( 'wordpress-importer', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
+
+    /**
+     * WordPress Importer object for registering the import callback
+     * @global WP_Import $wp_import
+     */
+    $GLOBALS['wp_import'] = new WP_Import();
+    register_importer( 'wordpress', 'WordPress', __('Import <strong>posts, pages, comments, custom fields, categories, and tags</strong> from a WordPress export file.', 'wordpress-importer'), array( $GLOBALS['wp_import'], 'dispatch' ) );
 }
 add_action( 'admin_init', 'wordpress_importer_init' );

Spacing +369 added lines, -369 removed lines

@@ -10,25 +10,25 @@ 
 License: GPL version 2 or later - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 */
 
-if ( ! defined( 'WP_LOAD_IMPORTERS' ) ) {
+if ( ! defined('WP_LOAD_IMPORTERS')) {
 	return;
 }
 
 /** Display verbose errors */
-define( 'IMPORT_DEBUG', false );
+define('IMPORT_DEBUG', false);
 
 // Load Importer API
 require_once ABSPATH . 'wp-admin/includes/import.php';
 
-if ( ! class_exists( 'WP_Importer' ) ) {
+if ( ! class_exists('WP_Importer')) {
 	$class_wp_importer = ABSPATH . 'wp-admin/includes/class-wp-importer.php';
-	if ( file_exists( $class_wp_importer ) ) {
+	if (file_exists($class_wp_importer)) {
 			require $class_wp_importer;
 	}
 	}
 
 // include WXR file parsers
-require dirname( __FILE__ ) . '/parsers.php';
+require dirname(__FILE__) . '/parsers.php';
 
 /**
  * WordPress Importer class for managing the import process of a WXR file
@@ -36,7 +36,7 @@ 
  * @package WordPress
  * @subpackage Importer
  */
-if ( class_exists( 'WP_Importer' ) ) {
+if (class_exists('WP_Importer')) {
 class WP_Import extends WP_Importer {
 	var $max_wxr_version = 1.2; // max. supported WXR version
 
@@ -73,24 +73,24 @@ 
 	function dispatch() {
 		$this->header();
 
-		$step = empty( $_GET['step'] ) ? 0 : (int) $_GET['step'];
-		switch ( $step ) {
+		$step = empty($_GET['step']) ? 0 : (int) $_GET['step'];
+		switch ($step) {
 			case 0:
 				$this->greet();
 				break;
 			case 1:
-				check_admin_referer( 'import-upload' );
-				if ( $this->handle_upload() ) {
+				check_admin_referer('import-upload');
+				if ($this->handle_upload()) {
 									$this->import_options();
 				}
 				break;
 			case 2:
-				check_admin_referer( 'import-wordpress' );
-				$this->fetch_attachments = ( ! empty( $_POST['fetch_attachments'] ) && $this->allow_fetch_attachments() );
+				check_admin_referer('import-wordpress');
+				$this->fetch_attachments = ( ! empty($_POST['fetch_attachments']) && $this->allow_fetch_attachments());
 				$this->id = (int) $_POST['import_id'];
-				$file = get_attached_file( $this->id );
+				$file = get_attached_file($this->id);
 				set_time_limit(0);
-				$this->import( $file );
+				$this->import($file);
 				break;
 		}
 
@@ -102,20 +102,20 @@ 
 	 *
 	 * @param string $file Path to the WXR file for importing
 	 */
-	function import( $file ) {
-		add_filter( 'import_post_meta_key', array( $this, 'is_valid_meta_key' ) );
-		add_filter( 'http_request_timeout', array( &$this, 'bump_request_timeout' ) );
+	function import($file) {
+		add_filter('import_post_meta_key', array($this, 'is_valid_meta_key'));
+		add_filter('http_request_timeout', array(&$this, 'bump_request_timeout'));
 
-		$this->import_start( $file );
+		$this->import_start($file);
 
 		$this->get_author_mapping();
 
-		wp_suspend_cache_invalidation( true );
+		wp_suspend_cache_invalidation(true);
 		$this->process_categories();
 		$this->process_tags();
 		$this->process_terms();
 		$this->process_posts();
-		wp_suspend_cache_invalidation( false );
+		wp_suspend_cache_invalidation(false);
 
 		// update incorrect/missing information in the DB
 		$this->backfill_parents();
@@ -130,56 +130,56 @@ 
 	 *
 	 * @param string $file Path to the WXR file for importing
 	 */
-	function import_start( $file ) {
-		if ( ! is_file($file) ) {
-			echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
-			echo __( 'The file does not exist, please try again.', 'wordpress-importer' ) . '</p>';
+	function import_start($file) {
+		if ( ! is_file($file)) {
+			echo '<p><strong>' . __('Sorry, there has been an error.', 'wordpress-importer') . '</strong><br />';
+			echo __('The file does not exist, please try again.', 'wordpress-importer') . '</p>';
 			$this->footer();
 			die();
 		}
 
-		$import_data = $this->parse( $file );
+		$import_data = $this->parse($file);
 
-		if ( is_wp_error( $import_data ) ) {
-			echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
-			echo esc_html( $import_data->get_error_message() ) . '</p>';
+		if (is_wp_error($import_data)) {
+			echo '<p><strong>' . __('Sorry, there has been an error.', 'wordpress-importer') . '</strong><br />';
+			echo esc_html($import_data->get_error_message()) . '</p>';
 			$this->footer();
 			die();
 		}
 
 		$this->version = $import_data['version'];
-		$this->get_authors_from_import( $import_data );
+		$this->get_authors_from_import($import_data);
 		$this->posts = $import_data['posts'];
 		$this->terms = $import_data['terms'];
 		$this->categories = $import_data['categories'];
 		$this->tags = $import_data['tags'];
-		$this->base_url = esc_url( $import_data['base_url'] );
+		$this->base_url = esc_url($import_data['base_url']);
 
-		wp_defer_term_counting( true );
-		wp_defer_comment_counting( true );
+		wp_defer_term_counting(true);
+		wp_defer_comment_counting(true);
 
-		do_action( 'import_start' );
+		do_action('import_start');
 	}
 
 	/**
 	 * Performs post-import cleanup of files and the cache
 	 */
 	function import_end() {
-		wp_import_cleanup( $this->id );
+		wp_import_cleanup($this->id);
 
 		wp_cache_flush();
-		foreach ( get_taxonomies() as $tax ) {
-			delete_option( "{$tax}_children" );
-			_get_term_hierarchy( $tax );
+		foreach (get_taxonomies() as $tax) {
+			delete_option("{$tax}_children");
+			_get_term_hierarchy($tax);
 		}
 
-		wp_defer_term_counting( false );
-		wp_defer_comment_counting( false );
+		wp_defer_term_counting(false);
+		wp_defer_comment_counting(false);
 
-		echo '<p>' . __( 'All done.', 'wordpress-importer' ) . ' <a href="' . admin_url() . '">' . __( 'Have fun!', 'wordpress-importer' ) . '</a>' . '</p>';
-		echo '<p>' . __( 'Remember to update the passwords and roles of imported users.', 'wordpress-importer' ) . '</p>';
+		echo '<p>' . __('All done.', 'wordpress-importer') . ' <a href="' . admin_url() . '">' . __('Have fun!', 'wordpress-importer') . '</a>' . '</p>';
+		echo '<p>' . __('Remember to update the passwords and roles of imported users.', 'wordpress-importer') . '</p>';
 
-		do_action( 'import_end' );
+		do_action('import_end');
 	}
 
 	/**
@@ -191,33 +191,33 @@ 
 	function handle_upload() {
 		$file = wp_import_handle_upload();
 
-		if ( isset( $file['error'] ) ) {
-			echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
-			echo esc_html( $file['error'] ) . '</p>';
+		if (isset($file['error'])) {
+			echo '<p><strong>' . __('Sorry, there has been an error.', 'wordpress-importer') . '</strong><br />';
+			echo esc_html($file['error']) . '</p>';
 			return false;
-		} else if ( ! file_exists( $file['file'] ) ) {
-			echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
-			printf( __( 'The export file could not be found at <code>%s</code>. It is likely that this was caused by a permissions problem.', 'wordpress-importer' ), esc_html( $file['file'] ) );
+		} else if ( ! file_exists($file['file'])) {
+			echo '<p><strong>' . __('Sorry, there has been an error.', 'wordpress-importer') . '</strong><br />';
+			printf(__('The export file could not be found at <code>%s</code>. It is likely that this was caused by a permissions problem.', 'wordpress-importer'), esc_html($file['file']));
 			echo '</p>';
 			return false;
 		}
 
 		$this->id = (int) $file['id'];
-		$import_data = $this->parse( $file['file'] );
-		if ( is_wp_error( $import_data ) ) {
-			echo '<p><strong>' . __( 'Sorry, there has been an error.', 'wordpress-importer' ) . '</strong><br />';
-			echo esc_html( $import_data->get_error_message() ) . '</p>';
+		$import_data = $this->parse($file['file']);
+		if (is_wp_error($import_data)) {
+			echo '<p><strong>' . __('Sorry, there has been an error.', 'wordpress-importer') . '</strong><br />';
+			echo esc_html($import_data->get_error_message()) . '</p>';
 			return false;
 		}
 
 		$this->version = $import_data['version'];
-		if ( $this->version > $this->max_wxr_version ) {
+		if ($this->version > $this->max_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 consider updating.', 'wordpress-importer' ), esc_html($import_data['version']) );
+			printf(__('This WXR file (version %s) may not be supported by this version of the importer. Please consider updating.', 'wordpress-importer'), esc_html($import_data['version']));
 			echo '</strong></p></div>';
 		}
 
-		$this->get_authors_from_import( $import_data );
+		$this->get_authors_from_import($import_data);
 
 		return true;
 	}
@@ -230,20 +230,20 @@ 
 	 *
 	 * @param array $import_data Data returned by a WXR parser
 	 */
-	function get_authors_from_import( $import_data ) {
-		if ( ! empty( $import_data['authors'] ) ) {
+	function get_authors_from_import($import_data) {
+		if ( ! empty($import_data['authors'])) {
 			$this->authors = $import_data['authors'];
 		// no author information, grab it from the posts
 		} else {
-			foreach ( $import_data['posts'] as $post ) {
-				$login = sanitize_user( $post['post_author'], true );
-				if ( empty( $login ) ) {
-					printf( __( 'Failed to import author %s. Their posts will be attributed to the current user.', 'wordpress-importer' ), esc_html( $post['post_author'] ) );
+			foreach ($import_data['posts'] as $post) {
+				$login = sanitize_user($post['post_author'], true);
+				if (empty($login)) {
+					printf(__('Failed to import author %s. Their posts will be attributed to the current user.', 'wordpress-importer'), esc_html($post['post_author']));
 					echo '<br />';
 					continue;
 				}
 
-				if ( ! isset($this->authors[$login]) ) {
+				if ( ! isset($this->authors[$login])) {
 									$this->authors[$login] = array(
 						'author_login' => $login,
 						'author_display_name' => $post['post_author']
@@ -260,32 +260,32 @@ 
 	function import_options() {
 		$j = 0;
 ?>
-<form action="<?php echo admin_url( 'admin.php?import=wordpress&amp;step=2' ); ?>" method="post">
-	<?php wp_nonce_field( 'import-wordpress' ); ?>
+<form action="<?php echo admin_url('admin.php?import=wordpress&amp;step=2'); ?>" method="post">
+	<?php wp_nonce_field('import-wordpress'); ?>
 	<input type="hidden" name="import_id" value="<?php echo $this->id; ?>" />
 
-<?php if ( ! empty( $this->authors ) ) : ?>
-	<h3><?php _e( 'Assign Authors', 'wordpress-importer' ); ?></h3>
-	<p><?php _e( 'To make it easier for you to edit and save the imported content, you may want to reassign the author of the imported item to an existing user of this site. For example, you may want to import all the entries as <code>admin</code>s entries.', 'wordpress-importer' ); ?></p>
-<?php if ( $this->allow_create_users() ) : ?>
-	<p><?php printf( __( 'If a new user is created by WordPress, a new password will be randomly generated and the new user&#8217;s role will be set as %s. Manually changing the new user&#8217;s details will be necessary.', 'wordpress-importer' ), esc_html( get_option('default_role') ) ); ?></p>
+<?php if ( ! empty($this->authors)) : ?>
+	<h3><?php _e('Assign Authors', 'wordpress-importer'); ?></h3>
+	<p><?php _e('To make it easier for you to edit and save the imported content, you may want to reassign the author of the imported item to an existing user of this site. For example, you may want to import all the entries as <code>admin</code>s entries.', 'wordpress-importer'); ?></p>
+<?php if ($this->allow_create_users()) : ?>
+	<p><?php printf(__('If a new user is created by WordPress, a new password will be randomly generated and the new user&#8217;s role will be set as %s. Manually changing the new user&#8217;s details will be necessary.', 'wordpress-importer'), esc_html(get_option('default_role'))); ?></p>
 <?php endif; ?>
 	<ol id="authors">
-<?php foreach ( $this->authors as $author ) : ?>
-		<li><?php $this->author_select( $j++, $author ); ?></li>
+<?php foreach ($this->authors as $author) : ?>
+		<li><?php $this->author_select($j++, $author); ?></li>
 <?php endforeach; ?>
 	</ol>
 <?php endif; ?>
 
-<?php if ( $this->allow_fetch_attachments() ) : ?>
-	<h3><?php _e( 'Import Attachments', 'wordpress-importer' ); ?></h3>
+<?php if ($this->allow_fetch_attachments()) : ?>
+	<h3><?php _e('Import Attachments', 'wordpress-importer'); ?></h3>
 	<p>
 		<input type="checkbox" value="1" name="fetch_attachments" id="import-attachments" />
-		<label for="import-attachments"><?php _e( 'Download and import file attachments', 'wordpress-importer' ); ?></label>
+		<label for="import-attachments"><?php _e('Download and import file attachments', 'wordpress-importer'); ?></label>
 	</p>
 <?php endif; ?>
 
-	<p class="submit"><input type="submit" class="button" value="<?php esc_attr_e( 'Submit', 'wordpress-importer' ); ?>" /></p>
+	<p class="submit"><input type="submit" class="button" value="<?php esc_attr_e('Submit', 'wordpress-importer'); ?>" /></p>
 </form>
 <?php
 	}
@@ -297,40 +297,40 @@ 
 	 * @param int $n Index for each author in the form
 	 * @param array $author Author information, e.g. login, display name, email
 	 */
-	function author_select( $n, $author ) {
-		_e( 'Import author:', 'wordpress-importer' );
-		echo ' <strong>' . esc_html( $author['author_display_name'] );
-		if ( $this->version != '1.0' ) {
-		    echo ' (' . esc_html( $author['author_login'] ) . ')';
+	function author_select($n, $author) {
+		_e('Import author:', 'wordpress-importer');
+		echo ' <strong>' . esc_html($author['author_display_name']);
+		if ($this->version != '1.0') {
+		    echo ' (' . esc_html($author['author_login']) . ')';
 		}
 		echo '</strong><br />';
 
-		if ( $this->version != '1.0' ) {
+		if ($this->version != '1.0') {
 					echo '<div style="margin-left:18px">';
 		}
 
 		$create_users = $this->allow_create_users();
-		if ( $create_users ) {
-			if ( $this->version != '1.0' ) {
-				_e( 'or create new user with login name:', 'wordpress-importer' );
+		if ($create_users) {
+			if ($this->version != '1.0') {
+				_e('or create new user with login name:', 'wordpress-importer');
 				$value = '';
 			} else {
-				_e( 'as a new user:', 'wordpress-importer' );
-				$value = esc_attr( sanitize_user( $author['author_login'], true ) );
+				_e('as a new user:', 'wordpress-importer');
+				$value = esc_attr(sanitize_user($author['author_login'], true));
 			}
 
-			echo ' <input type="text" name="user_new['.$n.']" value="'. $value .'" /><br />';
+			echo ' <input type="text" name="user_new[' . $n . ']" value="' . $value . '" /><br />';
 		}
 
-		if ( ! $create_users && $this->version == '1.0' ) {
-					_e( 'assign posts to an existing user:', 'wordpress-importer' );
+		if ( ! $create_users && $this->version == '1.0') {
+					_e('assign posts to an existing user:', 'wordpress-importer');
 		} else {
-					_e( 'or assign posts to an existing user:', 'wordpress-importer' );
+					_e('or assign posts to an existing user:', 'wordpress-importer');
 		}
-		wp_dropdown_users( array( 'name' => "user_map[$n]", 'multi' => true, 'show_option_all' => __( '- Select -', 'wordpress-importer' ) ) );
-		echo '<input type="hidden" name="imported_authors['.$n.']" value="' . esc_attr( $author['author_login'] ) . '" />';
+		wp_dropdown_users(array('name' => "user_map[$n]", 'multi' => true, 'show_option_all' => __('- Select -', 'wordpress-importer')));
+		echo '<input type="hidden" name="imported_authors[' . $n . ']" value="' . esc_attr($author['author_login']) . '" />';
 
-		if ( $this->version != '1.0' ) {
+		if ($this->version != '1.0') {
 					echo '</div>';
 		}
 	}
@@ -341,48 +341,48 @@ 
 	 * or falls back to the current user in case of error with either of the previous
 	 */
 	function get_author_mapping() {
-		if ( ! isset( $_POST['imported_authors'] ) ) {
+		if ( ! isset($_POST['imported_authors'])) {
 					return;
 		}
 
 		$create_users = $this->allow_create_users();
 
-		foreach ( (array) $_POST['imported_authors'] as $i => $old_login ) {
+		foreach ((array) $_POST['imported_authors'] as $i => $old_login) {
 			// Multisite adds strtolower to sanitize_user. Need to sanitize here to stop breakage in process_posts.
-			$santized_old_login = sanitize_user( $old_login, true );
-			$old_id = isset( $this->authors[$old_login]['author_id'] ) ? intval($this->authors[$old_login]['author_id']) : false;
+			$santized_old_login = sanitize_user($old_login, true);
+			$old_id = isset($this->authors[$old_login]['author_id']) ? intval($this->authors[$old_login]['author_id']) : false;
 
-			if ( ! empty( $_POST['user_map'][$i] ) ) {
-				$user = get_userdata( intval($_POST['user_map'][$i]) );
-				if ( isset( $user->ID ) ) {
-					if ( $old_id ) {
+			if ( ! empty($_POST['user_map'][$i])) {
+				$user = get_userdata(intval($_POST['user_map'][$i]));
+				if (isset($user->ID)) {
+					if ($old_id) {
 											$this->processed_authors[$old_id] = $user->ID;
 					}
 					$this->author_mapping[$santized_old_login] = $user->ID;
 				}
-			} else if ( $create_users ) {
-				if ( ! empty($_POST['user_new'][$i]) ) {
-					$user_id = wp_create_user( $_POST['user_new'][$i], wp_generate_password() );
-				} else if ( $this->version != '1.0' ) {
+			} else if ($create_users) {
+				if ( ! empty($_POST['user_new'][$i])) {
+					$user_id = wp_create_user($_POST['user_new'][$i], wp_generate_password());
+				} else if ($this->version != '1.0') {
 					$user_data = array(
 						'user_login' => $old_login,
 						'user_pass' => wp_generate_password(),
-						'user_email' => isset( $this->authors[$old_login]['author_email'] ) ? $this->authors[$old_login]['author_email'] : '',
+						'user_email' => isset($this->authors[$old_login]['author_email']) ? $this->authors[$old_login]['author_email'] : '',
 						'display_name' => $this->authors[$old_login]['author_display_name'],
-						'first_name' => isset( $this->authors[$old_login]['author_first_name'] ) ? $this->authors[$old_login]['author_first_name'] : '',
-						'last_name' => isset( $this->authors[$old_login]['author_last_name'] ) ? $this->authors[$old_login]['author_last_name'] : '',
+						'first_name' => isset($this->authors[$old_login]['author_first_name']) ? $this->authors[$old_login]['author_first_name'] : '',
+						'last_name' => isset($this->authors[$old_login]['author_last_name']) ? $this->authors[$old_login]['author_last_name'] : '',
 					);
-					$user_id = wp_insert_user( $user_data );
+					$user_id = wp_insert_user($user_data);
 				}
 
-				if ( ! is_wp_error( $user_id ) ) {
-					if ( $old_id ) {
+				if ( ! is_wp_error($user_id)) {
+					if ($old_id) {
 											$this->processed_authors[$old_id] = $user_id;
 					}
 					$this->author_mapping[$santized_old_login] = $user_id;
 				} else {
-					printf( __( 'Failed to create new user for %s. Their posts will be attributed to the current user.', 'wordpress-importer' ), esc_html($this->authors[$old_login]['author_display_name']) );
-					if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+					printf(__('Failed to create new user for %s. Their posts will be attributed to the current user.', 'wordpress-importer'), esc_html($this->authors[$old_login]['author_display_name']));
+					if (defined('IMPORT_DEBUG') && IMPORT_DEBUG) {
 											echo ' ' . $user_id->get_error_message();
 					}
 					echo '<br />';
@@ -390,8 +390,8 @@ 
 			}
 
 			// failsafe: if the user_id was invalid, default to the current user
-			if ( ! isset( $this->author_mapping[$santized_old_login] ) ) {
-				if ( $old_id ) {
+			if ( ! isset($this->author_mapping[$santized_old_login])) {
+				if ($old_id) {
 									$this->processed_authors[$old_id] = (int) get_current_user_id();
 				}
 				$this->author_mapping[$santized_old_login] = (int) get_current_user_id();
@@ -405,53 +405,53 @@ 
 	 * Doesn't create a new category if its slug already exists
 	 */
 	function process_categories() {
-		$this->categories = apply_filters( 'wp_import_categories', $this->categories );
+		$this->categories = apply_filters('wp_import_categories', $this->categories);
 
-		if ( empty( $this->categories ) ) {
+		if (empty($this->categories)) {
 					return;
 		}
 
-		foreach ( $this->categories as $cat ) {
+		foreach ($this->categories as $cat) {
 			// if the category already exists leave it alone
-			$term_id = term_exists( $cat['category_nicename'], 'category' );
-			if ( $term_id ) {
-				if ( is_array($term_id) ) {
+			$term_id = term_exists($cat['category_nicename'], 'category');
+			if ($term_id) {
+				if (is_array($term_id)) {
 				    $term_id = $term_id['term_id'];
 				}
-				if ( isset($cat['term_id']) ) {
+				if (isset($cat['term_id'])) {
 									$this->processed_terms[intval($cat['term_id'])] = (int) $term_id;
 				}
 				continue;
 			}
 
-			$category_parent = empty( $cat['category_parent'] ) ? 0 : category_exists( $cat['category_parent'] );
-			$category_description = isset( $cat['category_description'] ) ? $cat['category_description'] : '';
+			$category_parent = empty($cat['category_parent']) ? 0 : category_exists($cat['category_parent']);
+			$category_description = isset($cat['category_description']) ? $cat['category_description'] : '';
 			$catarr = array(
 				'category_nicename' => $cat['category_nicename'],
 				'category_parent' => $category_parent,
 				'cat_name' => $cat['cat_name'],
 				'category_description' => $category_description
 			);
-			$catarr = wp_slash( $catarr );
+			$catarr = wp_slash($catarr);
 
-			$id = wp_insert_category( $catarr );
-			if ( ! is_wp_error( $id ) ) {
-				if ( isset($cat['term_id']) ) {
+			$id = wp_insert_category($catarr);
+			if ( ! is_wp_error($id)) {
+				if (isset($cat['term_id'])) {
 									$this->processed_terms[intval($cat['term_id'])] = $id;
 				}
 			} else {
-				printf( __( 'Failed to import category %s', 'wordpress-importer' ), esc_html($cat['category_nicename']) );
-				if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+				printf(__('Failed to import category %s', 'wordpress-importer'), esc_html($cat['category_nicename']));
+				if (defined('IMPORT_DEBUG') && IMPORT_DEBUG) {
 									echo ': ' . $id->get_error_message();
 				}
 				echo '<br />';
 				continue;
 			}
 
-			$this->process_termmeta( $cat, $id['term_id'] );
+			$this->process_termmeta($cat, $id['term_id']);
 		}
 
-		unset( $this->categories );
+		unset($this->categories);
 	}
 
 	/**
@@ -460,47 +460,47 @@ 
 	 * Doesn't create a tag if its slug already exists
 	 */
 	function process_tags() {
-		$this->tags = apply_filters( 'wp_import_tags', $this->tags );
+		$this->tags = apply_filters('wp_import_tags', $this->tags);
 
-		if ( empty( $this->tags ) ) {
+		if (empty($this->tags)) {
 					return;
 		}
 
-		foreach ( $this->tags as $tag ) {
+		foreach ($this->tags as $tag) {
 			// if the tag already exists leave it alone
-			$term_id = term_exists( $tag['tag_slug'], 'post_tag' );
-			if ( $term_id ) {
-				if ( is_array($term_id) ) {
+			$term_id = term_exists($tag['tag_slug'], 'post_tag');
+			if ($term_id) {
+				if (is_array($term_id)) {
 				    $term_id = $term_id['term_id'];
 				}
-				if ( isset($tag['term_id']) ) {
+				if (isset($tag['term_id'])) {
 									$this->processed_terms[intval($tag['term_id'])] = (int) $term_id;
 				}
 				continue;
 			}
 
-			$tag = wp_slash( $tag );
-			$tag_desc = isset( $tag['tag_description'] ) ? $tag['tag_description'] : '';
-			$tagarr = array( 'slug' => $tag['tag_slug'], 'description' => $tag_desc );
+			$tag = wp_slash($tag);
+			$tag_desc = isset($tag['tag_description']) ? $tag['tag_description'] : '';
+			$tagarr = array('slug' => $tag['tag_slug'], 'description' => $tag_desc);
 
-			$id = wp_insert_term( $tag['tag_name'], 'post_tag', $tagarr );
-			if ( ! is_wp_error( $id ) ) {
-				if ( isset($tag['term_id']) ) {
+			$id = wp_insert_term($tag['tag_name'], 'post_tag', $tagarr);
+			if ( ! is_wp_error($id)) {
+				if (isset($tag['term_id'])) {
 									$this->processed_terms[intval($tag['term_id'])] = $id['term_id'];
 				}
 			} else {
-				printf( __( 'Failed to import post tag %s', 'wordpress-importer' ), esc_html($tag['tag_name']) );
-				if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+				printf(__('Failed to import post tag %s', 'wordpress-importer'), esc_html($tag['tag_name']));
+				if (defined('IMPORT_DEBUG') && IMPORT_DEBUG) {
 									echo ': ' . $id->get_error_message();
 				}
 				echo '<br />';
 				continue;
 			}
 
-			$this->process_termmeta( $tag, $id['term_id'] );
+			$this->process_termmeta($tag, $id['term_id']);
 		}
 
-		unset( $this->tags );
+		unset($this->tags);
 	}
 
 	/**
@@ -509,55 +509,55 @@ 
 	 * Doesn't create a term its slug already exists
 	 */
 	function process_terms() {
-		$this->terms = apply_filters( 'wp_import_terms', $this->terms );
+		$this->terms = apply_filters('wp_import_terms', $this->terms);
 
-		if ( empty( $this->terms ) ) {
+		if (empty($this->terms)) {
 					return;
 		}
 
-		foreach ( $this->terms as $term ) {
+		foreach ($this->terms as $term) {
 			// if the term already exists in the correct taxonomy leave it alone
-			$term_id = term_exists( $term['slug'], $term['term_taxonomy'] );
-			if ( $term_id ) {
-				if ( is_array($term_id) ) {
+			$term_id = term_exists($term['slug'], $term['term_taxonomy']);
+			if ($term_id) {
+				if (is_array($term_id)) {
 				    $term_id = $term_id['term_id'];
 				}
-				if ( isset($term['term_id']) ) {
+				if (isset($term['term_id'])) {
 									$this->processed_terms[intval($term['term_id'])] = (int) $term_id;
 				}
 				continue;
 			}
 
-			if ( empty( $term['term_parent'] ) ) {
+			if (empty($term['term_parent'])) {
 				$parent = 0;
 			} else {
-				$parent = term_exists( $term['term_parent'], $term['term_taxonomy'] );
-				if ( is_array( $parent ) ) {
+				$parent = term_exists($term['term_parent'], $term['term_taxonomy']);
+				if (is_array($parent)) {
 				    $parent = $parent['term_id'];
 				}
 			}
-			$term = wp_slash( $term );
-			$description = isset( $term['term_description'] ) ? $term['term_description'] : '';
-			$termarr = array( 'slug' => $term['slug'], 'description' => $description, 'parent' => intval($parent) );
+			$term = wp_slash($term);
+			$description = isset($term['term_description']) ? $term['term_description'] : '';
+			$termarr = array('slug' => $term['slug'], 'description' => $description, 'parent' => intval($parent));
 
-			$id = wp_insert_term( $term['term_name'], $term['term_taxonomy'], $termarr );
-			if ( ! is_wp_error( $id ) ) {
-				if ( isset($term['term_id']) ) {
+			$id = wp_insert_term($term['term_name'], $term['term_taxonomy'], $termarr);
+			if ( ! is_wp_error($id)) {
+				if (isset($term['term_id'])) {
 									$this->processed_terms[intval($term['term_id'])] = $id['term_id'];
 				}
 			} else {
-				printf( __( 'Failed to import %s %s', 'wordpress-importer' ), esc_html($term['term_taxonomy']), esc_html($term['term_name']) );
-				if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+				printf(__('Failed to import %s %s', 'wordpress-importer'), esc_html($term['term_taxonomy']), esc_html($term['term_name']));
+				if (defined('IMPORT_DEBUG') && IMPORT_DEBUG) {
 									echo ': ' . $id->get_error_message();
 				}
 				echo '<br />';
 				continue;
 			}
 
-			$this->process_termmeta( $term, $id['term_id'] );
+			$this->process_termmeta($term, $id['term_id']);
 		}
 
-		unset( $this->terms );
+		unset($this->terms);
 	}
 
 	/**
@@ -568,8 +568,8 @@ 
 	 * @param array $term    Term data from WXR import.
 	 * @param int   $term_id ID of the newly created term.
 	 */
-	protected function process_termmeta( $term, $term_id ) {
-		if ( ! isset( $term['termmeta'] ) ) {
+	protected function process_termmeta($term, $term_id) {
+		if ( ! isset($term['termmeta'])) {
 			$term['termmeta'] = array();
 		}
 
@@ -582,13 +582,13 @@ 
 		 * @param int   $term_id  ID of the newly created term.
 		 * @param array $term     Term data from the WXR import.
 		 */
-		$term['termmeta'] = apply_filters( 'wp_import_term_meta', $term['termmeta'], $term_id, $term );
+		$term['termmeta'] = apply_filters('wp_import_term_meta', $term['termmeta'], $term_id, $term);
 
-		if ( empty( $term['termmeta'] ) ) {
+		if (empty($term['termmeta'])) {
 			return;
 		}
 
-		foreach ( $term['termmeta'] as $meta ) {
+		foreach ($term['termmeta'] as $meta) {
 			/**
 			 * Filters the meta key for an imported piece of term meta.
 			 *
@@ -598,15 +598,15 @@ 
 			 * @param int    $term_id  ID of the newly created term.
 			 * @param array  $term     Term data from the WXR import.
 			 */
-			$key = apply_filters( 'import_term_meta_key', $meta['key'], $term_id, $term );
-			if ( ! $key ) {
+			$key = apply_filters('import_term_meta_key', $meta['key'], $term_id, $term);
+			if ( ! $key) {
 				continue;
 			}
 
 			// Export gets meta straight from the DB so could have a serialized string
-			$value = maybe_unserialize( $meta['value'] );
+			$value = maybe_unserialize($meta['value']);
 
-			add_term_meta( $term_id, $key, $value );
+			add_term_meta($term_id, $key, $value);
 
 			/**
 			 * Fires after term meta is imported.
@@ -617,7 +617,7 @@ 
 			 * @param string $key     Meta key.
 			 * @param mixed  $value   Meta value.
 			 */
-			do_action( 'import_term_meta', $term_id, $key, $value );
+			do_action('import_term_meta', $term_id, $key, $value);
 		}
 	}
 
@@ -630,35 +630,35 @@ 
 	 * Note that new/updated terms, comments and meta are imported for the last of the above.
 	 */
 	function process_posts() {
-		$this->posts = apply_filters( 'wp_import_posts', $this->posts );
+		$this->posts = apply_filters('wp_import_posts', $this->posts);
 
-		foreach ( $this->posts as $post ) {
-			$post = apply_filters( 'wp_import_post_data_raw', $post );
+		foreach ($this->posts as $post) {
+			$post = apply_filters('wp_import_post_data_raw', $post);
 
-			if ( ! post_type_exists( $post['post_type'] ) ) {
-				printf( __( 'Failed to import &#8220;%s&#8221;: Invalid post type %s', 'wordpress-importer' ),
-					esc_html($post['post_title']), esc_html($post['post_type']) );
+			if ( ! post_type_exists($post['post_type'])) {
+				printf(__('Failed to import &#8220;%s&#8221;: Invalid post type %s', 'wordpress-importer'),
+					esc_html($post['post_title']), esc_html($post['post_type']));
 				echo '<br />';
-				do_action( 'wp_import_post_exists', $post );
+				do_action('wp_import_post_exists', $post);
 				continue;
 			}
 
-			if ( isset( $this->processed_posts[$post['post_id']] ) && ! empty( $post['post_id'] ) ) {
+			if (isset($this->processed_posts[$post['post_id']]) && ! empty($post['post_id'])) {
 							continue;
 			}
 
-			if ( $post['status'] == 'auto-draft' ) {
+			if ($post['status'] == 'auto-draft') {
 							continue;
 			}
 
-			if ( 'nav_menu_item' == $post['post_type'] ) {
-				$this->process_menu_item( $post );
+			if ('nav_menu_item' == $post['post_type']) {
+				$this->process_menu_item($post);
 				continue;
 			}
 
-			$post_type_object = get_post_type_object( $post['post_type'] );
+			$post_type_object = get_post_type_object($post['post_type']);
 
-			$post_exists = post_exists( $post['post_title'], '', $post['post_date'] );
+			$post_exists = post_exists($post['post_title'], '', $post['post_date']);
 
 			/**
 			* Filter ID of the existing post corresponding to post currently importing.
@@ -672,18 +672,18 @@ 
 			* @param int   $post_exists  Post ID, or 0 if post did not exist.
 			* @param array $post         The post array to be inserted.
 			*/
-			$post_exists = apply_filters( 'wp_import_existing_post', $post_exists, $post );
+			$post_exists = apply_filters('wp_import_existing_post', $post_exists, $post);
 
-			if ( $post_exists && get_post_type( $post_exists ) == $post['post_type'] ) {
-				printf( __('%s &#8220;%s&#8221; already exists.', 'wordpress-importer'), $post_type_object->labels->singular_name, esc_html($post['post_title']) );
+			if ($post_exists && get_post_type($post_exists) == $post['post_type']) {
+				printf(__('%s &#8220;%s&#8221; already exists.', 'wordpress-importer'), $post_type_object->labels->singular_name, esc_html($post['post_title']));
 				echo '<br />';
 				$comment_post_ID = $post_id = $post_exists;
-				$this->processed_posts[ intval( $post['post_id'] ) ] = intval( $post_exists );
+				$this->processed_posts[intval($post['post_id'])] = intval($post_exists);
 			} else {
 				$post_parent = (int) $post['post_parent'];
-				if ( $post_parent ) {
+				if ($post_parent) {
 					// if we already know the parent, map it to the new local ID
-					if ( isset( $this->processed_posts[$post_parent] ) ) {
+					if (isset($this->processed_posts[$post_parent])) {
 						$post_parent = $this->processed_posts[$post_parent];
 					// otherwise record the parent for later
 					} else {
@@ -693,8 +693,8 @@ 
 				}
 
 				// map the post author
-				$author = sanitize_user( $post['post_author'], true );
-				if ( isset( $this->author_mapping[$author] ) ) {
+				$author = sanitize_user($post['post_author'], true);
+				if (isset($this->author_mapping[$author])) {
 									$author = $this->author_mapping[$author];
 				} else {
 									$author = (int) get_current_user_id();
@@ -711,20 +711,20 @@ 
 				);
 
 				$original_post_ID = $post['post_id'];
-				$postdata = apply_filters( 'wp_import_post_data_processed', $postdata, $post );
+				$postdata = apply_filters('wp_import_post_data_processed', $postdata, $post);
 
-				$postdata = wp_slash( $postdata );
+				$postdata = wp_slash($postdata);
 
-				if ( 'attachment' == $postdata['post_type'] ) {
+				if ('attachment' == $postdata['post_type']) {
 					$remote_url = ! empty($post['attachment_url']) ? $post['attachment_url'] : $post['guid'];
 
 					// try to use _wp_attached file for upload folder placement to ensure the same location as the export site
 					// e.g. location is 2003/05/image.jpg but the attachment post_date is 2010/09, see media_handle_upload()
 					$postdata['upload_date'] = $post['post_date'];
-					if ( isset( $post['postmeta'] ) ) {
-						foreach( $post['postmeta'] as $meta ) {
-							if ( $meta['key'] == '_wp_attached_file' ) {
-								if ( preg_match( '%^[0-9]{4}/[0-9]{2}%', $meta['value'], $matches ) ) {
+					if (isset($post['postmeta'])) {
+						foreach ($post['postmeta'] as $meta) {
+							if ($meta['key'] == '_wp_attached_file') {
+								if (preg_match('%^[0-9]{4}/[0-9]{2}%', $meta['value'], $matches)) {
 																	$postdata['upload_date'] = $matches[0];
 								}
 								break;
@@ -732,81 +732,81 @@ 
 						}
 					}
 
-					$comment_post_ID = $post_id = $this->process_attachment( $postdata, $remote_url );
+					$comment_post_ID = $post_id = $this->process_attachment($postdata, $remote_url);
 				} else {
-					$comment_post_ID = $post_id = wp_insert_post( $postdata, true );
-					do_action( 'wp_import_insert_post', $post_id, $original_post_ID, $postdata, $post );
+					$comment_post_ID = $post_id = wp_insert_post($postdata, true);
+					do_action('wp_import_insert_post', $post_id, $original_post_ID, $postdata, $post);
 				}
 
-				if ( is_wp_error( $post_id ) ) {
-					printf( __( 'Failed to import %s &#8220;%s&#8221;', 'wordpress-importer' ),
-						$post_type_object->labels->singular_name, esc_html($post['post_title']) );
-					if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+				if (is_wp_error($post_id)) {
+					printf(__('Failed to import %s &#8220;%s&#8221;', 'wordpress-importer'),
+						$post_type_object->labels->singular_name, esc_html($post['post_title']));
+					if (defined('IMPORT_DEBUG') && IMPORT_DEBUG) {
 											echo ': ' . $post_id->get_error_message();
 					}
 					echo '<br />';
 					continue;
 				}
 
-				if ( $post['is_sticky'] == 1 ) {
-									stick_post( $post_id );
+				if ($post['is_sticky'] == 1) {
+									stick_post($post_id);
 				}
 			}
 
 			// map pre-import ID to local ID
 			$this->processed_posts[intval($post['post_id'])] = (int) $post_id;
 
-			if ( ! isset( $post['terms'] ) ) {
+			if ( ! isset($post['terms'])) {
 							$post['terms'] = array();
 			}
 
-			$post['terms'] = apply_filters( 'wp_import_post_terms', $post['terms'], $post_id, $post );
+			$post['terms'] = apply_filters('wp_import_post_terms', $post['terms'], $post_id, $post);
 
 			// add categories, tags and other terms
-			if ( ! empty( $post['terms'] ) ) {
+			if ( ! empty($post['terms'])) {
 				$terms_to_set = array();
-				foreach ( $post['terms'] as $term ) {
+				foreach ($post['terms'] as $term) {
 					// back compat with WXR 1.0 map 'tag' to 'post_tag'
-					$taxonomy = ( 'tag' == $term['domain'] ) ? 'post_tag' : $term['domain'];
-					$term_exists = term_exists( $term['slug'], $taxonomy );
-					$term_id = is_array( $term_exists ) ? $term_exists['term_id'] : $term_exists;
-					if ( ! $term_id ) {
-						$t = wp_insert_term( $term['name'], $taxonomy, array( 'slug' => $term['slug'] ) );
-						if ( ! is_wp_error( $t ) ) {
+					$taxonomy = ('tag' == $term['domain']) ? 'post_tag' : $term['domain'];
+					$term_exists = term_exists($term['slug'], $taxonomy);
+					$term_id = is_array($term_exists) ? $term_exists['term_id'] : $term_exists;
+					if ( ! $term_id) {
+						$t = wp_insert_term($term['name'], $taxonomy, array('slug' => $term['slug']));
+						if ( ! is_wp_error($t)) {
 							$term_id = $t['term_id'];
-							do_action( 'wp_import_insert_term', $t, $term, $post_id, $post );
+							do_action('wp_import_insert_term', $t, $term, $post_id, $post);
 						} else {
-							printf( __( 'Failed to import %s %s', 'wordpress-importer' ), esc_html($taxonomy), esc_html($term['name']) );
-							if ( defined('IMPORT_DEBUG') && IMPORT_DEBUG ) {
+							printf(__('Failed to import %s %s', 'wordpress-importer'), esc_html($taxonomy), esc_html($term['name']));
+							if (defined('IMPORT_DEBUG') && IMPORT_DEBUG) {
 															echo ': ' . $t->get_error_message();
 							}
 							echo '<br />';
-							do_action( 'wp_import_insert_term_failed', $t, $term, $post_id, $post );
+							do_action('wp_import_insert_term_failed', $t, $term, $post_id, $post);
 							continue;
 						}
 					}
-					$terms_to_set[$taxonomy][] = intval( $term_id );
+					$terms_to_set[$taxonomy][] = intval($term_id);
 				}
 
-				foreach ( $terms_to_set as $tax => $ids ) {
-					$tt_ids = wp_set_post_terms( $post_id, $ids, $tax );
-					do_action( 'wp_import_set_post_terms', $tt_ids, $ids, $tax, $post_id, $post );
+				foreach ($terms_to_set as $tax => $ids) {
+					$tt_ids = wp_set_post_terms($post_id, $ids, $tax);
+					do_action('wp_import_set_post_terms', $tt_ids, $ids, $tax, $post_id, $post);
 				}
-				unset( $post['terms'], $terms_to_set );
+				unset($post['terms'], $terms_to_set);
 			}
 
-			if ( ! isset( $post['comments'] ) ) {
+			if ( ! isset($post['comments'])) {
 							$post['comments'] = array();
 			}
 
-			$post['comments'] = apply_filters( 'wp_import_post_comments', $post['comments'], $post_id, $post );
+			$post['comments'] = apply_filters('wp_import_post_comments', $post['comments'], $post_id, $post);
 
 			// add/update comments
-			if ( ! empty( $post['comments'] ) ) {
+			if ( ! empty($post['comments'])) {
 				$num_comments = 0;
 				$inserted_comments = array();
-				foreach ( $post['comments'] as $comment ) {
-					$comment_id	= $comment['comment_id'];
+				foreach ($post['comments'] as $comment) {
+					$comment_id = $comment['comment_id'];
 					$newcomments[$comment_id]['comment_post_ID']      = $comment_post_ID;
 					$newcomments[$comment_id]['comment_author']       = $comment['comment_author'];
 					$newcomments[$comment_id]['comment_author_email'] = $comment['comment_author_email'];
@@ -817,66 +817,66 @@ 
 					$newcomments[$comment_id]['comment_content']      = $comment['comment_content'];
 					$newcomments[$comment_id]['comment_approved']     = $comment['comment_approved'];
 					$newcomments[$comment_id]['comment_type']         = $comment['comment_type'];
-					$newcomments[$comment_id]['comment_parent'] 	  = $comment['comment_parent'];
-					$newcomments[$comment_id]['commentmeta']          = isset( $comment['commentmeta'] ) ? $comment['commentmeta'] : array();
-					if ( isset( $this->processed_authors[$comment['comment_user_id']] ) ) {
+					$newcomments[$comment_id]['comment_parent'] = $comment['comment_parent'];
+					$newcomments[$comment_id]['commentmeta']          = isset($comment['commentmeta']) ? $comment['commentmeta'] : array();
+					if (isset($this->processed_authors[$comment['comment_user_id']])) {
 											$newcomments[$comment_id]['user_id'] = $this->processed_authors[$comment['comment_user_id']];
 					}
 				}
-				ksort( $newcomments );
+				ksort($newcomments);
 
-				foreach ( $newcomments as $key => $comment ) {
+				foreach ($newcomments as $key => $comment) {
 					// if this is a new post we can skip the comment_exists() check
-					if ( ! $post_exists || ! comment_exists( $comment['comment_author'], $comment['comment_date'] ) ) {
-						if ( isset( $inserted_comments[$comment['comment_parent']] ) ) {
+					if ( ! $post_exists || ! comment_exists($comment['comment_author'], $comment['comment_date'])) {
+						if (isset($inserted_comments[$comment['comment_parent']])) {
 													$comment['comment_parent'] = $inserted_comments[$comment['comment_parent']];
 						}
-						$comment = wp_filter_comment( $comment );
-						$inserted_comments[$key] = wp_insert_comment( $comment );
-						do_action( 'wp_import_insert_comment', $inserted_comments[$key], $comment, $comment_post_ID, $post );
+						$comment = wp_filter_comment($comment);
+						$inserted_comments[$key] = wp_insert_comment($comment);
+						do_action('wp_import_insert_comment', $inserted_comments[$key], $comment, $comment_post_ID, $post);
 
-						foreach( $comment['commentmeta'] as $meta ) {
-							$value = maybe_unserialize( $meta['value'] );
-							add_comment_meta( $inserted_comments[$key], $meta['key'], $value );
+						foreach ($comment['commentmeta'] as $meta) {
+							$value = maybe_unserialize($meta['value']);
+							add_comment_meta($inserted_comments[$key], $meta['key'], $value);
 						}
 
 						$num_comments++;
 					}
 				}
-				unset( $newcomments, $inserted_comments, $post['comments'] );
+				unset($newcomments, $inserted_comments, $post['comments']);
 			}
 
-			if ( ! isset( $post['postmeta'] ) ) {
+			if ( ! isset($post['postmeta'])) {
 							$post['postmeta'] = array();
 			}
 
-			$post['postmeta'] = apply_filters( 'wp_import_post_meta', $post['postmeta'], $post_id, $post );
+			$post['postmeta'] = apply_filters('wp_import_post_meta', $post['postmeta'], $post_id, $post);
 
 			// add/update post meta
-			if ( ! empty( $post['postmeta'] ) ) {
-				foreach ( $post['postmeta'] as $meta ) {
-					$key = apply_filters( 'import_post_meta_key', $meta['key'], $post_id, $post );
+			if ( ! empty($post['postmeta'])) {
+				foreach ($post['postmeta'] as $meta) {
+					$key = apply_filters('import_post_meta_key', $meta['key'], $post_id, $post);
 					$value = false;
 
-					if ( '_edit_last' == $key ) {
-						if ( isset( $this->processed_authors[intval($meta['value'])] ) ) {
+					if ('_edit_last' == $key) {
+						if (isset($this->processed_authors[intval($meta['value'])])) {
 													$value = $this->processed_authors[intval($meta['value'])];
 						} else {
 													$key = false;
 						}
 					}
 
-					if ( $key ) {
+					if ($key) {
 						// export gets meta straight from the DB so could have a serialized string
-						if ( ! $value ) {
-													$value = maybe_unserialize( $meta['value'] );
+						if ( ! $value) {
+													$value = maybe_unserialize($meta['value']);
 						}
 
-						add_post_meta( $post_id, $key, $value );
-						do_action( 'import_post_meta', $post_id, $key, $value );
+						add_post_meta($post_id, $key, $value);
+						do_action('import_post_meta', $post_id, $key, $value);
 
 						// if the post has a featured image, take note of this in case of remap
-						if ( '_thumbnail_id' == $key ) {
+						if ('_thumbnail_id' == $key) {
 													$this->featured_images[$post_id] = (int) $value;
 						}
 					}
@@ -884,7 +884,7 @@ 
 			}
 		}
 
-		unset( $this->posts );
+		unset($this->posts);
 	}
 
 	/**
@@ -897,17 +897,17 @@ 
 	 *
 	 * @param array $item Menu item details from WXR file
 	 */
-	function process_menu_item( $item ) {
+	function process_menu_item($item) {
 		// skip draft, orphaned menu items
-		if ( 'draft' == $item['status'] ) {
+		if ('draft' == $item['status']) {
 					return;
 		}
 
 		$menu_slug = false;
-		if ( isset($item['terms']) ) {
+		if (isset($item['terms'])) {
 			// loop through terms, assume first nav_menu term is correct menu
-			foreach ( $item['terms'] as $term ) {
-				if ( 'nav_menu' == $term['domain'] ) {
+			foreach ($item['terms'] as $term) {
+				if ('nav_menu' == $term['domain']) {
 					$menu_slug = $term['slug'];
 					break;
 				}
@@ -915,53 +915,53 @@ 
 		}
 
 		// no nav_menu term associated with this menu item
-		if ( ! $menu_slug ) {
-			_e( 'Menu item skipped due to missing menu slug', 'wordpress-importer' );
+		if ( ! $menu_slug) {
+			_e('Menu item skipped due to missing menu slug', 'wordpress-importer');
 			echo '<br />';
 			return;
 		}
 
-		$menu_id = term_exists( $menu_slug, 'nav_menu' );
-		if ( ! $menu_id ) {
-			printf( __( 'Menu item skipped due to invalid menu slug: %s', 'wordpress-importer' ), esc_html( $menu_slug ) );
+		$menu_id = term_exists($menu_slug, 'nav_menu');
+		if ( ! $menu_id) {
+			printf(__('Menu item skipped due to invalid menu slug: %s', 'wordpress-importer'), esc_html($menu_slug));
 			echo '<br />';
 			return;
 		} else {
-			$menu_id = is_array( $menu_id ) ? $menu_id['term_id'] : $menu_id;
+			$menu_id = is_array($menu_id) ? $menu_id['term_id'] : $menu_id;
 		}
 
-		foreach ( $item['postmeta'] as $meta ) {
+		foreach ($item['postmeta'] as $meta) {
 					$$meta['key'] = $meta['value'];
 		}
 
-		if ( 'taxonomy' == $_menu_item_type && isset( $this->processed_terms[intval($_menu_item_object_id)] ) ) {
+		if ('taxonomy' == $_menu_item_type && isset($this->processed_terms[intval($_menu_item_object_id)])) {
 			$_menu_item_object_id = $this->processed_terms[intval($_menu_item_object_id)];
-		} else if ( 'post_type' == $_menu_item_type && isset( $this->processed_posts[intval($_menu_item_object_id)] ) ) {
+		} else if ('post_type' == $_menu_item_type && isset($this->processed_posts[intval($_menu_item_object_id)])) {
 			$_menu_item_object_id = $this->processed_posts[intval($_menu_item_object_id)];
-		} else if ( 'custom' != $_menu_item_type ) {
+		} else if ('custom' != $_menu_item_type) {
 			// associated object is missing or not imported yet, we'll retry later
 			$this->missing_menu_items[] = $item;
 			return;
 		}
 
-		if ( isset( $this->processed_menu_items[intval($_menu_item_menu_item_parent)] ) ) {
+		if (isset($this->processed_menu_items[intval($_menu_item_menu_item_parent)])) {
 			$_menu_item_menu_item_parent = $this->processed_menu_items[intval($_menu_item_menu_item_parent)];
-		} else if ( $_menu_item_menu_item_parent ) {
+		} else if ($_menu_item_menu_item_parent) {
 			$this->menu_item_orphans[intval($item['post_id'])] = (int) $_menu_item_menu_item_parent;
 			$_menu_item_menu_item_parent = 0;
 		}
 
 		// wp_update_nav_menu_item expects CSS classes as a space separated string
-		$_menu_item_classes = maybe_unserialize( $_menu_item_classes );
-		if ( is_array( $_menu_item_classes ) ) {
-					$_menu_item_classes = implode( ' ', $_menu_item_classes );
+		$_menu_item_classes = maybe_unserialize($_menu_item_classes);
+		if (is_array($_menu_item_classes)) {
+					$_menu_item_classes = implode(' ', $_menu_item_classes);
 		}
 
 		$args = array(
 			'menu-item-object-id' => $_menu_item_object_id,
 			'menu-item-object' => $_menu_item_object,
 			'menu-item-parent-id' => $_menu_item_menu_item_parent,
-			'menu-item-position' => intval( $item['menu_order'] ),
+			'menu-item-position' => intval($item['menu_order']),
 			'menu-item-type' => $_menu_item_type,
 			'menu-item-title' => $item['post_title'],
 			'menu-item-url' => $_menu_item_url,
@@ -973,8 +973,8 @@ 
 			'menu-item-status' => $item['status']
 		);
 
-		$id = wp_update_nav_menu_item( $menu_id, 0, $args );
-		if ( $id && ! is_wp_error( $id ) ) {
+		$id = wp_update_nav_menu_item($menu_id, 0, $args);
+		if ($id && ! is_wp_error($id)) {
 					$this->processed_menu_items[intval($item['post_id'])] = (int) $id;
 		}
 	}
@@ -986,41 +986,41 @@ 
 	 * @param string $url URL to fetch attachment from
 	 * @return int|WP_Error Post ID on success, WP_Error otherwise
 	 */
-	function process_attachment( $post, $url ) {
-		if ( ! $this->fetch_attachments ) {
-					return new WP_Error( 'attachment_processing_error',
-				__( 'Fetching attachments is not enabled', 'wordpress-importer' ) );
+	function process_attachment($post, $url) {
+		if ( ! $this->fetch_attachments) {
+					return new WP_Error('attachment_processing_error',
+				__('Fetching attachments is not enabled', 'wordpress-importer'));
 		}
 
 		// if the URL is absolute, but does not contain address, then upload it assuming base_site_url
-		if ( preg_match( '|^/[\w\W]+$|', $url ) ) {
-					$url = rtrim( $this->base_url, '/' ) . $url;
+		if (preg_match('|^/[\w\W]+$|', $url)) {
+					$url = rtrim($this->base_url, '/') . $url;
 		}
 
-		$upload = $this->fetch_remote_file( $url, $post );
-		if ( is_wp_error( $upload ) ) {
+		$upload = $this->fetch_remote_file($url, $post);
+		if (is_wp_error($upload)) {
 					return $upload;
 		}
 
-		if ( $info = wp_check_filetype( $upload['file'] ) ) {
+		if ($info = wp_check_filetype($upload['file'])) {
 					$post['post_mime_type'] = $info['type'];
 		} else {
-					return new WP_Error( 'attachment_processing_error', __('Invalid file type', 'wordpress-importer') );
+					return new WP_Error('attachment_processing_error', __('Invalid file type', 'wordpress-importer'));
 		}
 
 		$post['guid'] = $upload['url'];
 
 		// as per wp-admin/includes/upload.php
-		$post_id = wp_insert_attachment( $post, $upload['file'] );
-		wp_update_attachment_metadata( $post_id, wp_generate_attachment_metadata( $post_id, $upload['file'] ) );
+		$post_id = wp_insert_attachment($post, $upload['file']);
+		wp_update_attachment_metadata($post_id, wp_generate_attachment_metadata($post_id, $upload['file']));
 
 		// remap resized image URLs, works by stripping the extension and remapping the URL stub.
-		if ( preg_match( '!^image/!', $info['type'] ) ) {
-			$parts = pathinfo( $url );
-			$name = basename( $parts['basename'], ".{$parts['extension']}" ); // PATHINFO_FILENAME in PHP 5.2
+		if (preg_match('!^image/!', $info['type'])) {
+			$parts = pathinfo($url);
+			$name = basename($parts['basename'], ".{$parts['extension']}"); // PATHINFO_FILENAME in PHP 5.2
 
-			$parts_new = pathinfo( $upload['url'] );
-			$name_new = basename( $parts_new['basename'], ".{$parts_new['extension']}" );
+			$parts_new = pathinfo($upload['url']);
+			$name_new = basename($parts_new['basename'], ".{$parts_new['extension']}");
 
 			$this->url_remap[$parts['dirname'] . '/' . $name] = $parts_new['dirname'] . '/' . $name_new;
 		}
@@ -1035,54 +1035,54 @@ 
 	 * @param array $post Attachment details
 	 * @return array|WP_Error Local file location details on success, WP_Error otherwise
 	 */
-	function fetch_remote_file( $url, $post ) {
+	function fetch_remote_file($url, $post) {
 		// extract the file name and extension from the url
-		$file_name = basename( $url );
+		$file_name = basename($url);
 
 		// get placeholder file in the upload dir with a unique, sanitized filename
-		$upload = wp_upload_bits( $file_name, 0, '', $post['upload_date'] );
-		if ( $upload['error'] ) {
-					return new WP_Error( 'upload_dir_error', $upload['error'] );
+		$upload = wp_upload_bits($file_name, 0, '', $post['upload_date']);
+		if ($upload['error']) {
+					return new WP_Error('upload_dir_error', $upload['error']);
 		}
 
 		// fetch the remote url and write it to the placeholder file
-		$headers = wp_get_http( $url, $upload['file'] );
+		$headers = wp_get_http($url, $upload['file']);
 
 		// request failed
-		if ( ! $headers ) {
-			@unlink( $upload['file'] );
-			return new WP_Error( 'import_file_error', __('Remote server did not respond', 'wordpress-importer') );
+		if ( ! $headers) {
+			@unlink($upload['file']);
+			return new WP_Error('import_file_error', __('Remote server did not respond', 'wordpress-importer'));
 		}
 
 		// make sure the fetch was successful
-		if ( $headers['response'] != '200' ) {
-			@unlink( $upload['file'] );
-			return new WP_Error( 'import_file_error', sprintf( __('Remote server returned error response %1$d %2$s', 'wordpress-importer'), esc_html($headers['response']), get_status_header_desc($headers['response']) ) );
+		if ($headers['response'] != '200') {
+			@unlink($upload['file']);
+			return new WP_Error('import_file_error', sprintf(__('Remote server returned error response %1$d %2$s', 'wordpress-importer'), esc_html($headers['response']), get_status_header_desc($headers['response'])));
 		}
 
-		$filesize = filesize( $upload['file'] );
+		$filesize = filesize($upload['file']);
 
-		if ( isset( $headers['content-length'] ) && $filesize != $headers['content-length'] ) {
-			@unlink( $upload['file'] );
-			return new WP_Error( 'import_file_error', __('Remote file is incorrect size', 'wordpress-importer') );
+		if (isset($headers['content-length']) && $filesize != $headers['content-length']) {
+			@unlink($upload['file']);
+			return new WP_Error('import_file_error', __('Remote file is incorrect size', 'wordpress-importer'));
 		}
 
-		if ( 0 == $filesize ) {
-			@unlink( $upload['file'] );
-			return new WP_Error( 'import_file_error', __('Zero size file downloaded', 'wordpress-importer') );
+		if (0 == $filesize) {
+			@unlink($upload['file']);
+			return new WP_Error('import_file_error', __('Zero size file downloaded', 'wordpress-importer'));
 		}
 
 		$max_size = (int) $this->max_attachment_size();
-		if ( ! empty( $max_size ) && $filesize > $max_size ) {
-			@unlink( $upload['file'] );
-			return new WP_Error( 'import_file_error', sprintf(__('Remote file is too large, limit is %s', 'wordpress-importer'), size_format($max_size) ) );
+		if ( ! empty($max_size) && $filesize > $max_size) {
+			@unlink($upload['file']);
+			return new WP_Error('import_file_error', sprintf(__('Remote file is too large, limit is %s', 'wordpress-importer'), size_format($max_size)));
 		}
 
 		// keep track of the old and new urls so we can substitute them later
 		$this->url_remap[$url] = $upload['url'];
 		$this->url_remap[$post['guid']] = $upload['url']; // r13735, really needed?
 		// keep track of the destination if the remote url is redirected somewhere else
-		if ( isset($headers['x-final-location']) && $headers['x-final-location'] != $url ) {
+		if (isset($headers['x-final-location']) && $headers['x-final-location'] != $url) {
 					$this->url_remap[$headers['x-final-location']] = $upload['url'];
 		}
 
@@ -1100,38 +1100,38 @@ 
 		global $wpdb;
 
 		// find parents for post orphans
-		foreach ( $this->post_orphans as $child_id => $parent_id ) {
+		foreach ($this->post_orphans as $child_id => $parent_id) {
 			$local_child_id = $local_parent_id = false;
-			if ( isset( $this->processed_posts[$child_id] ) ) {
+			if (isset($this->processed_posts[$child_id])) {
 							$local_child_id = $this->processed_posts[$child_id];
 			}
-			if ( isset( $this->processed_posts[$parent_id] ) ) {
+			if (isset($this->processed_posts[$parent_id])) {
 							$local_parent_id = $this->processed_posts[$parent_id];
 			}
 
-			if ( $local_child_id && $local_parent_id ) {
-							$wpdb->update( $wpdb->posts, array( 'post_parent' => $local_parent_id ), array( 'ID' => $local_child_id ), '%d', '%d' );
+			if ($local_child_id && $local_parent_id) {
+							$wpdb->update($wpdb->posts, array('post_parent' => $local_parent_id), array('ID' => $local_child_id), '%d', '%d');
 			}
 		}
 
 		// all other posts/terms are imported, retry menu items with missing associated object
 		$missing_menu_items = $this->missing_menu_items;
-		foreach ( $missing_menu_items as $item ) {
-					$this->process_menu_item( $item );
+		foreach ($missing_menu_items as $item) {
+					$this->process_menu_item($item);
 		}
 
 		// find parents for menu item orphans
-		foreach ( $this->menu_item_orphans as $child_id => $parent_id ) {
+		foreach ($this->menu_item_orphans as $child_id => $parent_id) {
 			$local_child_id = $local_parent_id = 0;
-			if ( isset( $this->processed_menu_items[$child_id] ) ) {
+			if (isset($this->processed_menu_items[$child_id])) {
 							$local_child_id = $this->processed_menu_items[$child_id];
 			}
-			if ( isset( $this->processed_menu_items[$parent_id] ) ) {
+			if (isset($this->processed_menu_items[$parent_id])) {
 							$local_parent_id = $this->processed_menu_items[$parent_id];
 			}
 
-			if ( $local_child_id && $local_parent_id ) {
-							update_post_meta( $local_child_id, '_menu_item_menu_item_parent', (int) $local_parent_id );
+			if ($local_child_id && $local_parent_id) {
+							update_post_meta($local_child_id, '_menu_item_menu_item_parent', (int) $local_parent_id);
 			}
 		}
 	}
@@ -1142,13 +1142,13 @@ 
 	function backfill_attachment_urls() {
 		global $wpdb;
 		// make sure we do the longest urls first, in case one is a substring of another
-		uksort( $this->url_remap, array(&$this, 'cmpr_strlen') );
+		uksort($this->url_remap, array(&$this, 'cmpr_strlen'));
 
-		foreach ( $this->url_remap as $from_url => $to_url ) {
+		foreach ($this->url_remap as $from_url => $to_url) {
 			// remap urls in post_content
-			$wpdb->query( $wpdb->prepare("UPDATE {$wpdb->posts} SET post_content = REPLACE(post_content, %s, %s)", $from_url, $to_url) );
+			$wpdb->query($wpdb->prepare("UPDATE {$wpdb->posts} SET post_content = REPLACE(post_content, %s, %s)", $from_url, $to_url));
 			// remap enclosure urls
-			$result = $wpdb->query( $wpdb->prepare("UPDATE {$wpdb->postmeta} SET meta_value = REPLACE(meta_value, %s, %s) WHERE meta_key='enclosure'", $from_url, $to_url) );
+			$result = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->postmeta} SET meta_value = REPLACE(meta_value, %s, %s) WHERE meta_key='enclosure'", $from_url, $to_url));
 		}
 	}
 
@@ -1157,12 +1157,12 @@ 
 	 */
 	function remap_featured_images() {
 		// cycle through posts that have a featured image
-		foreach ( $this->featured_images as $post_id => $value ) {
-			if ( isset( $this->processed_posts[$value] ) ) {
+		foreach ($this->featured_images as $post_id => $value) {
+			if (isset($this->processed_posts[$value])) {
 				$new_id = $this->processed_posts[$value];
 				// only update if there's a difference
-				if ( $new_id != $value ) {
-									update_post_meta( $post_id, '_thumbnail_id', $new_id );
+				if ($new_id != $value) {
+									update_post_meta($post_id, '_thumbnail_id', $new_id);
 				}
 			}
 		}
@@ -1174,23 +1174,23 @@ 
 	 * @param string $file Path to WXR file for parsing
 	 * @return array Information gathered from the WXR file
 	 */
-	function parse( $file ) {
+	function parse($file) {
 		$parser = new WXR_Parser();
-		return $parser->parse( $file );
+		return $parser->parse($file);
 	}
 
 	// Display import page title
 	function header() {
 		echo '<div class="wrap">';
 		screen_icon();
-		echo '<h2>' . __( 'Import WordPress', 'wordpress-importer' ) . '</h2>';
+		echo '<h2>' . __('Import WordPress', 'wordpress-importer') . '</h2>';
 
 		$updates = get_plugin_updates();
 		$basename = plugin_basename(__FILE__);
-		if ( isset( $updates[$basename] ) ) {
+		if (isset($updates[$basename])) {
 			$update = $updates[$basename];
 			echo '<div class="error"><p><strong>';
-			printf( __( 'A new version of this importer is available. Please update to version %s to ensure compatibility with newer export files.', 'wordpress-importer' ), $update->update->new_version );
+			printf(__('A new version of this importer is available. Please update to version %s to ensure compatibility with newer export files.', 'wordpress-importer'), $update->update->new_version);
 			echo '</strong></p></div>';
 		}
 	}
@@ -1205,9 +1205,9 @@ 
 	 */
 	function greet() {
 		echo '<div class="narrow">';
-		echo '<p>'.__( 'Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, pages, comments, custom fields, categories, and tags into this site.', 'wordpress-importer' ).'</p>';
-		echo '<p>'.__( 'Choose a WXR (.xml) file to upload, then click Upload file and import.', 'wordpress-importer' ).'</p>';
-		wp_import_upload_form( 'admin.php?import=wordpress&amp;step=1' );
+		echo '<p>' . __('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, pages, comments, custom fields, categories, and tags into this site.', 'wordpress-importer') . '</p>';
+		echo '<p>' . __('Choose a WXR (.xml) file to upload, then click Upload file and import.', 'wordpress-importer') . '</p>';
+		wp_import_upload_form('admin.php?import=wordpress&amp;step=1');
 		echo '</div>';
 	}
 
@@ -1217,10 +1217,10 @@ 
 	 * @param string $key The meta key to check
 	 * @return string|bool The key if we do want to import, false if not
 	 */
-	function is_valid_meta_key( $key ) {
+	function is_valid_meta_key($key) {
 		// skip attachment metadata since we'll regenerate it from scratch
 		// skip _edit_lock as not relevant for import
-		if ( in_array( $key, array( '_wp_attached_file', '_wp_attachment_metadata', '_edit_lock' ) ) ) {
+		if (in_array($key, array('_wp_attached_file', '_wp_attachment_metadata', '_edit_lock'))) {
 					return false;
 		}
 		return $key;
@@ -1233,7 +1233,7 @@ 
 	 * @return bool True if creating users is allowed
 	 */
 	function allow_create_users() {
-		return apply_filters( 'import_allow_create_users', true );
+		return apply_filters('import_allow_create_users', true);
 	}
 
 	/**
@@ -1244,7 +1244,7 @@ 
 	 * @return bool True if downloading attachments is allowed
 	 */
 	function allow_fetch_attachments() {
-		return apply_filters( 'import_allow_fetch_attachments', true );
+		return apply_filters('import_allow_fetch_attachments', true);
 	}
 
 	/**
@@ -1254,19 +1254,19 @@ 
 	 * @return int Maximum attachment file size to import
 	 */
 	function max_attachment_size() {
-		return apply_filters( 'import_attachment_size_limit', 0 );
+		return apply_filters('import_attachment_size_limit', 0);
 	}
 
 	/**
 	 * Added to http_request_timeout filter to force timeout at 60 seconds during import
 	 * @return int 60
 	 */
-	function bump_request_timeout( $val ) {
+	function bump_request_timeout($val) {
 		return 60;
 	}
 
 	// return the difference in length between two strings
-	function cmpr_strlen( $a, $b ) {
+	function cmpr_strlen($a, $b) {
 		return strlen($b) - strlen($a);
 	}
 }
@@ -1274,13 +1274,13 @@ 
 } // class_exists( 'WP_Importer' )
 
 function wordpress_importer_init() {
-	load_plugin_textdomain( 'wordpress-importer', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
+	load_plugin_textdomain('wordpress-importer', false, dirname(plugin_basename(__FILE__)) . '/languages');
 
 	/**
 	 * WordPress Importer object for registering the import callback
 	 * @global WP_Import $wp_import
 	 */
 	$GLOBALS['wp_import'] = new WP_Import();
-	register_importer( 'wordpress', 'WordPress', __('Import <strong>posts, pages, comments, custom fields, categories, and tags</strong> from a WordPress export file.', 'wordpress-importer'), array( $GLOBALS['wp_import'], 'dispatch' ) );
+	register_importer('wordpress', 'WordPress', __('Import <strong>posts, pages, comments, custom fields, categories, and tags</strong> from a WordPress export file.', 'wordpress-importer'), array($GLOBALS['wp_import'], 'dispatch'));
 }
-add_action( 'admin_init', 'wordpress_importer_init' );
+add_action('admin_init', 'wordpress_importer_init');

tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php

Doc Comments +3 added lines

@@ -31,6 +31,9 @@
 		return wp_insert_attachment( $r, $r['file'], $r['post_parent'] );
 	}
 
+	/**
+	 * @param string $file
+	 */
 	function create_upload_object( $file, $parent = 0 ) {
 		$contents = file_get_contents($file);
 		$upload = wp_upload_bits(basename($file), null, $contents);

Indentation +58 added lines, -58 removed lines

@@ -2,62 +2,62 @@
 
 class WP_UnitTest_Factory_For_Attachment extends WP_UnitTest_Factory_For_Post {
 
-	/**
-	 * Create an attachment fixture.
-	 *
-	 * @param array $args {
-	 *     Array of arguments. Accepts all arguments that can be passed to
-	 *     wp_insert_attachment(), in addition to the following:
-	 *     @type int    $post_parent ID of the post to which the attachment belongs.
-	 *     @type string $file        Path of the attached file.
-	 * }
-	 * @param int   $legacy_parent Deprecated.
-	 * @param array $legacy_args   Deprecated
-	 */
-	function create_object( $args, $legacy_parent = 0, $legacy_args = array() ) {
-		// Backward compatibility for legacy argument format.
-		if ( is_string( $args ) ) {
-			$file = $args;
-			$args = $legacy_args;
-			$args['post_parent'] = $legacy_parent;
-			$args['file'] = $file;
-		}
-
-		$r = array_merge( array(
-			'file' => '',
-			'post_parent' => 0,
-		), $args );
-
-		return wp_insert_attachment( $r, $r['file'], $r['post_parent'] );
-	}
-
-	function create_upload_object( $file, $parent = 0 ) {
-		$contents = file_get_contents($file);
-		$upload = wp_upload_bits(basename($file), null, $contents);
-
-		$type = '';
-		if ( ! empty($upload['type']) ) {
-			$type = $upload['type'];
-		} else {
-			$mime = wp_check_filetype( $upload['file'] );
-			if ($mime) {
-							$type = $mime['type'];
-			}
-		}
-
-		$attachment = array(
-			'post_title' => basename( $upload['file'] ),
-			'post_content' => '',
-			'post_type' => 'attachment',
-			'post_parent' => $parent,
-			'post_mime_type' => $type,
-			'guid' => $upload[ 'url' ],
-		);
-
-		// Save the data
-		$id = wp_insert_attachment( $attachment, $upload[ 'file' ], $parent );
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
-
-		return $id;
-	}
+    /**
+     * Create an attachment fixture.
+     *
+     * @param array $args {
+     *     Array of arguments. Accepts all arguments that can be passed to
+     *     wp_insert_attachment(), in addition to the following:
+     *     @type int    $post_parent ID of the post to which the attachment belongs.
+     *     @type string $file        Path of the attached file.
+     * }
+     * @param int   $legacy_parent Deprecated.
+     * @param array $legacy_args   Deprecated
+     */
+    function create_object( $args, $legacy_parent = 0, $legacy_args = array() ) {
+        // Backward compatibility for legacy argument format.
+        if ( is_string( $args ) ) {
+            $file = $args;
+            $args = $legacy_args;
+            $args['post_parent'] = $legacy_parent;
+            $args['file'] = $file;
+        }
+
+        $r = array_merge( array(
+            'file' => '',
+            'post_parent' => 0,
+        ), $args );
+
+        return wp_insert_attachment( $r, $r['file'], $r['post_parent'] );
+    }
+
+    function create_upload_object( $file, $parent = 0 ) {
+        $contents = file_get_contents($file);
+        $upload = wp_upload_bits(basename($file), null, $contents);
+
+        $type = '';
+        if ( ! empty($upload['type']) ) {
+            $type = $upload['type'];
+        } else {
+            $mime = wp_check_filetype( $upload['file'] );
+            if ($mime) {
+                            $type = $mime['type'];
+            }
+        }
+
+        $attachment = array(
+            'post_title' => basename( $upload['file'] ),
+            'post_content' => '',
+            'post_type' => 'attachment',
+            'post_parent' => $parent,
+            'post_mime_type' => $type,
+            'guid' => $upload[ 'url' ],
+        );
+
+        // Save the data
+        $id = wp_insert_attachment( $attachment, $upload[ 'file' ], $parent );
+        wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
+
+        return $id;
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -14,49 +14,49 @@
 	 * @param int   $legacy_parent Deprecated.
 	 * @param array $legacy_args   Deprecated
 	 */
-	function create_object( $args, $legacy_parent = 0, $legacy_args = array() ) {
+	function create_object($args, $legacy_parent = 0, $legacy_args = array()) {
 		// Backward compatibility for legacy argument format.
-		if ( is_string( $args ) ) {
+		if (is_string($args)) {
 			$file = $args;
 			$args = $legacy_args;
 			$args['post_parent'] = $legacy_parent;
 			$args['file'] = $file;
 		}
 
-		$r = array_merge( array(
+		$r = array_merge(array(
 			'file' => '',
 			'post_parent' => 0,
-		), $args );
+		), $args);
 
-		return wp_insert_attachment( $r, $r['file'], $r['post_parent'] );
+		return wp_insert_attachment($r, $r['file'], $r['post_parent']);
 	}
 
-	function create_upload_object( $file, $parent = 0 ) {
+	function create_upload_object($file, $parent = 0) {
 		$contents = file_get_contents($file);
 		$upload = wp_upload_bits(basename($file), null, $contents);
 
 		$type = '';
-		if ( ! empty($upload['type']) ) {
+		if ( ! empty($upload['type'])) {
 			$type = $upload['type'];
 		} else {
-			$mime = wp_check_filetype( $upload['file'] );
+			$mime = wp_check_filetype($upload['file']);
 			if ($mime) {
 							$type = $mime['type'];
 			}
 		}
 
 		$attachment = array(
-			'post_title' => basename( $upload['file'] ),
+			'post_title' => basename($upload['file']),
 			'post_content' => '',
 			'post_type' => 'attachment',
 			'post_parent' => $parent,
 			'post_mime_type' => $type,
-			'guid' => $upload[ 'url' ],
+			'guid' => $upload['url'],
 		);
 
 		// Save the data
-		$id = wp_insert_attachment( $attachment, $upload[ 'file' ], $parent );
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $upload['file'] ) );
+		$id = wp_insert_attachment($attachment, $upload['file'], $parent);
+		wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $upload['file']));
 
 		return $id;
 	}

tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php

Doc Comments +3 added lines

@@ -2,6 +2,9 @@
 
 class WP_UnitTest_Factory_For_Blog extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		global $current_site, $base;
 		parent::__construct( $factory );

Indentation +26 added lines, -26 removed lines

@@ -2,35 +2,35 @@
 
 class WP_UnitTest_Factory_For_Blog extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		global $current_site, $base;
-		parent::__construct( $factory );
-		$this->default_generation_definitions = array(
-			'domain' => $current_site->domain,
-			'path' => new WP_UnitTest_Generator_Sequence( $base . 'testpath%s' ),
-			'title' => new WP_UnitTest_Generator_Sequence( 'Site %s' ),
-			'site_id' => $current_site->id,
-		);
-	}
+    function __construct( $factory = null ) {
+        global $current_site, $base;
+        parent::__construct( $factory );
+        $this->default_generation_definitions = array(
+            'domain' => $current_site->domain,
+            'path' => new WP_UnitTest_Generator_Sequence( $base . 'testpath%s' ),
+            'title' => new WP_UnitTest_Generator_Sequence( 'Site %s' ),
+            'site_id' => $current_site->id,
+        );
+    }
 
-	function create_object( $args ) {
-		global $wpdb;
-		$meta = isset( $args['meta'] ) ? $args['meta'] : array( 'public' => 1 );
-		$user_id = isset( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
-		// temp tables will trigger db errors when we attempt to reference them as new temp tables
-		$suppress = $wpdb->suppress_errors();
-		$blog = wpmu_create_blog( $args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id'] );
-		$wpdb->suppress_errors( $suppress );
+    function create_object( $args ) {
+        global $wpdb;
+        $meta = isset( $args['meta'] ) ? $args['meta'] : array( 'public' => 1 );
+        $user_id = isset( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
+        // temp tables will trigger db errors when we attempt to reference them as new temp tables
+        $suppress = $wpdb->suppress_errors();
+        $blog = wpmu_create_blog( $args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id'] );
+        $wpdb->suppress_errors( $suppress );
 
-		// Tell WP we're done installing.
-		wp_installing( false );
+        // Tell WP we're done installing.
+        wp_installing( false );
 
-		return $blog;
-	}
+        return $blog;
+    }
 
-	function update_object( $blog_id, $fields ) {}
+    function update_object( $blog_id, $fields ) {}
 
-	function get_object_by_id( $blog_id ) {
-		return get_site( $blog_id );
-	}
+    function get_object_by_id( $blog_id ) {
+        return get_site( $blog_id );
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -2,35 +2,35 @@
 
 class WP_UnitTest_Factory_For_Blog extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
+	function __construct($factory = null) {
 		global $current_site, $base;
-		parent::__construct( $factory );
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
 			'domain' => $current_site->domain,
-			'path' => new WP_UnitTest_Generator_Sequence( $base . 'testpath%s' ),
-			'title' => new WP_UnitTest_Generator_Sequence( 'Site %s' ),
+			'path' => new WP_UnitTest_Generator_Sequence($base . 'testpath%s'),
+			'title' => new WP_UnitTest_Generator_Sequence('Site %s'),
 			'site_id' => $current_site->id,
 		);
 	}
 
-	function create_object( $args ) {
+	function create_object($args) {
 		global $wpdb;
-		$meta = isset( $args['meta'] ) ? $args['meta'] : array( 'public' => 1 );
-		$user_id = isset( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
+		$meta = isset($args['meta']) ? $args['meta'] : array('public' => 1);
+		$user_id = isset($args['user_id']) ? $args['user_id'] : get_current_user_id();
 		// temp tables will trigger db errors when we attempt to reference them as new temp tables
 		$suppress = $wpdb->suppress_errors();
-		$blog = wpmu_create_blog( $args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id'] );
-		$wpdb->suppress_errors( $suppress );
+		$blog = wpmu_create_blog($args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id']);
+		$wpdb->suppress_errors($suppress);
 
 		// Tell WP we're done installing.
-		wp_installing( false );
+		wp_installing(false);
 
 		return $blog;
 	}
 
-	function update_object( $blog_id, $fields ) {}
+	function update_object($blog_id, $fields) {}
 
-	function get_object_by_id( $blog_id ) {
-		return get_site( $blog_id );
+	function get_object_by_id($blog_id) {
+		return get_site($blog_id);
 	}
 }

tests/phpunit/includes/factory/class-wp-unittest-factory-for-comment.php

Doc Comments +3 added lines

@@ -2,6 +2,9 @@
 
 class WP_UnitTest_Factory_For_Comment extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(

Indentation +23 added lines, -23 removed lines

@@ -2,31 +2,31 @@
 
 class WP_UnitTest_Factory_For_Comment extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
-		$this->default_generation_definitions = array(
-			'comment_author' => new WP_UnitTest_Generator_Sequence( 'Commenter %s' ),
-			'comment_author_url' => new WP_UnitTest_Generator_Sequence( 'http://example.com/%s/' ),
-			'comment_approved' => 1,
-			'comment_content' => 'This is a comment'
-		);
-	}
+    function __construct( $factory = null ) {
+        parent::__construct( $factory );
+        $this->default_generation_definitions = array(
+            'comment_author' => new WP_UnitTest_Generator_Sequence( 'Commenter %s' ),
+            'comment_author_url' => new WP_UnitTest_Generator_Sequence( 'http://example.com/%s/' ),
+            'comment_approved' => 1,
+            'comment_content' => 'This is a comment'
+        );
+    }
 
-	function create_object( $args ) {
-		return wp_insert_comment( $this->addslashes_deep( $args ) );
-	}
+    function create_object( $args ) {
+        return wp_insert_comment( $this->addslashes_deep( $args ) );
+    }
 
-	function update_object( $comment_id, $fields ) {
-		$fields['comment_ID'] = $comment_id;
-		return wp_update_comment( $this->addslashes_deep( $fields ) );
-	}
+    function update_object( $comment_id, $fields ) {
+        $fields['comment_ID'] = $comment_id;
+        return wp_update_comment( $this->addslashes_deep( $fields ) );
+    }
 
-	function create_post_comments( $post_id, $count = 1, $args = array(), $generation_definitions = null ) {
-		$args['comment_post_ID'] = $post_id;
-		return $this->create_many( $count, $args, $generation_definitions );
-	}
+    function create_post_comments( $post_id, $count = 1, $args = array(), $generation_definitions = null ) {
+        $args['comment_post_ID'] = $post_id;
+        return $this->create_many( $count, $args, $generation_definitions );
+    }
 
-	function get_object_by_id( $comment_id ) {
-		return get_comment( $comment_id );
-	}
+    function get_object_by_id( $comment_id ) {
+        return get_comment( $comment_id );
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -2,31 +2,31 @@
 
 class WP_UnitTest_Factory_For_Comment extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
-			'comment_author' => new WP_UnitTest_Generator_Sequence( 'Commenter %s' ),
-			'comment_author_url' => new WP_UnitTest_Generator_Sequence( 'http://example.com/%s/' ),
+			'comment_author' => new WP_UnitTest_Generator_Sequence('Commenter %s'),
+			'comment_author_url' => new WP_UnitTest_Generator_Sequence('http://example.com/%s/'),
 			'comment_approved' => 1,
 			'comment_content' => 'This is a comment'
 		);
 	}
 
-	function create_object( $args ) {
-		return wp_insert_comment( $this->addslashes_deep( $args ) );
+	function create_object($args) {
+		return wp_insert_comment($this->addslashes_deep($args));
 	}
 
-	function update_object( $comment_id, $fields ) {
+	function update_object($comment_id, $fields) {
 		$fields['comment_ID'] = $comment_id;
-		return wp_update_comment( $this->addslashes_deep( $fields ) );
+		return wp_update_comment($this->addslashes_deep($fields));
 	}
 
-	function create_post_comments( $post_id, $count = 1, $args = array(), $generation_definitions = null ) {
+	function create_post_comments($post_id, $count = 1, $args = array(), $generation_definitions = null) {
 		$args['comment_post_ID'] = $post_id;
-		return $this->create_many( $count, $args, $generation_definitions );
+		return $this->create_many($count, $args, $generation_definitions);
 	}
 
-	function get_object_by_id( $comment_id ) {
-		return get_comment( $comment_id );
+	function get_object_by_id($comment_id) {
+		return get_comment($comment_id);
 	}
 }

tests/phpunit/includes/factory/class-wp-unittest-factory-for-network.php

Doc Comments +3 added lines

@@ -2,6 +2,9 @@
 
 class WP_UnitTest_Factory_For_Network extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(

Indentation +24 added lines, -24 removed lines

@@ -2,33 +2,33 @@
 
 class WP_UnitTest_Factory_For_Network extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
-		$this->default_generation_definitions = array(
-			'domain' => WP_TESTS_DOMAIN,
-			'title' => new WP_UnitTest_Generator_Sequence( 'Network %s' ),
-			'path' => new WP_UnitTest_Generator_Sequence( '/testpath%s/' ),
-			'network_id' => new WP_UnitTest_Generator_Sequence( '%s', 2 ),
-			'subdomain_install' => false,
-		);
-	}
+    function __construct( $factory = null ) {
+        parent::__construct( $factory );
+        $this->default_generation_definitions = array(
+            'domain' => WP_TESTS_DOMAIN,
+            'title' => new WP_UnitTest_Generator_Sequence( 'Network %s' ),
+            'path' => new WP_UnitTest_Generator_Sequence( '/testpath%s/' ),
+            'network_id' => new WP_UnitTest_Generator_Sequence( '%s', 2 ),
+            'subdomain_install' => false,
+        );
+    }
 
-	function create_object( $args ) {
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+    function create_object( $args ) {
+        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
-		if ( ! isset( $args['user'] ) ) {
-			$email = WP_TESTS_EMAIL;
-		} else {
-			$email = get_userdata( $args['user'] )->user_email;
-		}
+        if ( ! isset( $args['user'] ) ) {
+            $email = WP_TESTS_EMAIL;
+        } else {
+            $email = get_userdata( $args['user'] )->user_email;
+        }
 
-		populate_network( $args['network_id'], $args['domain'], $email, $args['title'], $args['path'], $args['subdomain_install'] );
-		return $args['network_id'];
-	}
+        populate_network( $args['network_id'], $args['domain'], $email, $args['title'], $args['path'], $args['subdomain_install'] );
+        return $args['network_id'];
+    }
 
-	function update_object( $network_id, $fields ) {}
+    function update_object( $network_id, $fields ) {}
 
-	function get_object_by_id( $network_id ) {
-		return get_network( $network_id );
-	}
+    function get_object_by_id( $network_id ) {
+        return get_network( $network_id );
+    }
 }

Spacing +12 added lines, -12 removed lines

@@ -2,33 +2,33 @@
 
 class WP_UnitTest_Factory_For_Network extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
 			'domain' => WP_TESTS_DOMAIN,
-			'title' => new WP_UnitTest_Generator_Sequence( 'Network %s' ),
-			'path' => new WP_UnitTest_Generator_Sequence( '/testpath%s/' ),
-			'network_id' => new WP_UnitTest_Generator_Sequence( '%s', 2 ),
+			'title' => new WP_UnitTest_Generator_Sequence('Network %s'),
+			'path' => new WP_UnitTest_Generator_Sequence('/testpath%s/'),
+			'network_id' => new WP_UnitTest_Generator_Sequence('%s', 2),
 			'subdomain_install' => false,
 		);
 	}
 
-	function create_object( $args ) {
+	function create_object($args) {
 		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
-		if ( ! isset( $args['user'] ) ) {
+		if ( ! isset($args['user'])) {
 			$email = WP_TESTS_EMAIL;
 		} else {
-			$email = get_userdata( $args['user'] )->user_email;
+			$email = get_userdata($args['user'])->user_email;
 		}
 
-		populate_network( $args['network_id'], $args['domain'], $email, $args['title'], $args['path'], $args['subdomain_install'] );
+		populate_network($args['network_id'], $args['domain'], $email, $args['title'], $args['path'], $args['subdomain_install']);
 		return $args['network_id'];
 	}
 
-	function update_object( $network_id, $fields ) {}
+	function update_object($network_id, $fields) {}
 
-	function get_object_by_id( $network_id ) {
-		return get_network( $network_id );
+	function get_object_by_id($network_id) {
+		return get_network($network_id);
 	}
 }

tests/phpunit/includes/factory/class-wp-unittest-factory-for-post.php

Doc Comments +3 added lines

@@ -2,6 +2,9 @@
 
 class WP_UnitTest_Factory_For_Post extends WP_UnitTest_Factory_For_Thing {
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 */
 	function __construct( $factory = null ) {
 		parent::__construct( $factory );
 		$this->default_generation_definitions = array(

Indentation +20 added lines, -20 removed lines

@@ -2,27 +2,27 @@
 
 class WP_UnitTest_Factory_For_Post extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
-		$this->default_generation_definitions = array(
-			'post_status' => 'publish',
-			'post_title' => new WP_UnitTest_Generator_Sequence( 'Post title %s' ),
-			'post_content' => new WP_UnitTest_Generator_Sequence( 'Post content %s' ),
-			'post_excerpt' => new WP_UnitTest_Generator_Sequence( 'Post excerpt %s' ),
-			'post_type' => 'post'
-		);
-	}
+    function __construct( $factory = null ) {
+        parent::__construct( $factory );
+        $this->default_generation_definitions = array(
+            'post_status' => 'publish',
+            'post_title' => new WP_UnitTest_Generator_Sequence( 'Post title %s' ),
+            'post_content' => new WP_UnitTest_Generator_Sequence( 'Post content %s' ),
+            'post_excerpt' => new WP_UnitTest_Generator_Sequence( 'Post excerpt %s' ),
+            'post_type' => 'post'
+        );
+    }
 
-	function create_object( $args ) {
-		return wp_insert_post( $args );
-	}
+    function create_object( $args ) {
+        return wp_insert_post( $args );
+    }
 
-	function update_object( $post_id, $fields ) {
-		$fields['ID'] = $post_id;
-		return wp_update_post( $fields );
-	}
+    function update_object( $post_id, $fields ) {
+        $fields['ID'] = $post_id;
+        return wp_update_post( $fields );
+    }
 
-	function get_object_by_id( $post_id ) {
-		return get_post( $post_id );
-	}
+    function get_object_by_id( $post_id ) {
+        return get_post( $post_id );
+    }
 }

Spacing +11 added lines, -11 removed lines

@@ -2,27 +2,27 @@
 
 class WP_UnitTest_Factory_For_Post extends WP_UnitTest_Factory_For_Thing {
 
-	function __construct( $factory = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null) {
+		parent::__construct($factory);
 		$this->default_generation_definitions = array(
 			'post_status' => 'publish',
-			'post_title' => new WP_UnitTest_Generator_Sequence( 'Post title %s' ),
-			'post_content' => new WP_UnitTest_Generator_Sequence( 'Post content %s' ),
-			'post_excerpt' => new WP_UnitTest_Generator_Sequence( 'Post excerpt %s' ),
+			'post_title' => new WP_UnitTest_Generator_Sequence('Post title %s'),
+			'post_content' => new WP_UnitTest_Generator_Sequence('Post content %s'),
+			'post_excerpt' => new WP_UnitTest_Generator_Sequence('Post excerpt %s'),
 			'post_type' => 'post'
 		);
 	}
 
-	function create_object( $args ) {
-		return wp_insert_post( $args );
+	function create_object($args) {
+		return wp_insert_post($args);
 	}
 
-	function update_object( $post_id, $fields ) {
+	function update_object($post_id, $fields) {
 		$fields['ID'] = $post_id;
-		return wp_update_post( $fields );
+		return wp_update_post($fields);
 	}
 
-	function get_object_by_id( $post_id ) {
-		return get_post( $post_id );
+	function get_object_by_id($post_id) {
+		return get_post($post_id);
 	}
 }

tests/phpunit/includes/factory/class-wp-unittest-factory-for-term.php

Doc Comments +7 added lines

@@ -5,6 +5,10 @@ 
 	private $taxonomy;
 	const DEFAULT_TAXONOMY = 'post_tag';
 
+	/**
+	 * @param WP_UnitTest_Factory $factory
+	 * @param string $taxonomy
+	 */
 	function __construct( $factory = null, $taxonomy = null ) {
 		parent::__construct( $factory );
 		$this->taxonomy = $taxonomy ? $taxonomy : self::DEFAULT_TAXONOMY;
@@ -33,6 +37,9 @@ 
 		return $term_id_pair['term_id'];
 	}
 
+	/**
+	 * @param string $taxonomy
+	 */
 	function add_post_terms( $post_id, $terms, $taxonomy, $append = true ) {
 		return wp_set_post_terms( $post_id, $terms, $taxonomy, $append );
 	}

Indentation +44 added lines, -44 removed lines

@@ -2,48 +2,48 @@
 
 class WP_UnitTest_Factory_For_Term extends WP_UnitTest_Factory_For_Thing {
 
-	private $taxonomy;
-	const DEFAULT_TAXONOMY = 'post_tag';
-
-	function __construct( $factory = null, $taxonomy = null ) {
-		parent::__construct( $factory );
-		$this->taxonomy = $taxonomy ? $taxonomy : self::DEFAULT_TAXONOMY;
-		$this->default_generation_definitions = array(
-			'name' => new WP_UnitTest_Generator_Sequence( 'Term %s' ),
-			'taxonomy' => $this->taxonomy,
-			'description' => new WP_UnitTest_Generator_Sequence( 'Term description %s' ),
-		);
-	}
-
-	function create_object( $args ) {
-		$args = array_merge( array( 'taxonomy' => $this->taxonomy ), $args );
-		$term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
-		if ( is_wp_error( $term_id_pair ) ) {
-					return $term_id_pair;
-		}
-		return $term_id_pair['term_id'];
-	}
-
-	function update_object( $term, $fields ) {
-		$fields = array_merge( array( 'taxonomy' => $this->taxonomy ), $fields );
-		if ( is_object( $term ) ) {
-					$taxonomy = $term->taxonomy;
-		}
-		$term_id_pair = wp_update_term( $term, $taxonomy, $fields );
-		return $term_id_pair['term_id'];
-	}
-
-	function add_post_terms( $post_id, $terms, $taxonomy, $append = true ) {
-		return wp_set_post_terms( $post_id, $terms, $taxonomy, $append );
-	}
-
-	function create_and_get( $args = array(), $generation_definitions = null ) {
-		$term_id = $this->create( $args, $generation_definitions );
-		$taxonomy = isset( $args['taxonomy'] ) ? $args['taxonomy'] : $this->taxonomy;
-		return get_term( $term_id, $taxonomy );
-	}
-
-	function get_object_by_id( $term_id ) {
-		return get_term( $term_id, $this->taxonomy );
-	}
+    private $taxonomy;
+    const DEFAULT_TAXONOMY = 'post_tag';
+
+    function __construct( $factory = null, $taxonomy = null ) {
+        parent::__construct( $factory );
+        $this->taxonomy = $taxonomy ? $taxonomy : self::DEFAULT_TAXONOMY;
+        $this->default_generation_definitions = array(
+            'name' => new WP_UnitTest_Generator_Sequence( 'Term %s' ),
+            'taxonomy' => $this->taxonomy,
+            'description' => new WP_UnitTest_Generator_Sequence( 'Term description %s' ),
+        );
+    }
+
+    function create_object( $args ) {
+        $args = array_merge( array( 'taxonomy' => $this->taxonomy ), $args );
+        $term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
+        if ( is_wp_error( $term_id_pair ) ) {
+                    return $term_id_pair;
+        }
+        return $term_id_pair['term_id'];
+    }
+
+    function update_object( $term, $fields ) {
+        $fields = array_merge( array( 'taxonomy' => $this->taxonomy ), $fields );
+        if ( is_object( $term ) ) {
+                    $taxonomy = $term->taxonomy;
+        }
+        $term_id_pair = wp_update_term( $term, $taxonomy, $fields );
+        return $term_id_pair['term_id'];
+    }
+
+    function add_post_terms( $post_id, $terms, $taxonomy, $append = true ) {
+        return wp_set_post_terms( $post_id, $terms, $taxonomy, $append );
+    }
+
+    function create_and_get( $args = array(), $generation_definitions = null ) {
+        $term_id = $this->create( $args, $generation_definitions );
+        $taxonomy = isset( $args['taxonomy'] ) ? $args['taxonomy'] : $this->taxonomy;
+        return get_term( $term_id, $taxonomy );
+    }
+
+    function get_object_by_id( $term_id ) {
+        return get_term( $term_id, $this->taxonomy );
+    }
 }

Spacing +20 added lines, -20 removed lines

@@ -5,45 +5,45 @@
 	private $taxonomy;
 	const DEFAULT_TAXONOMY = 'post_tag';
 
-	function __construct( $factory = null, $taxonomy = null ) {
-		parent::__construct( $factory );
+	function __construct($factory = null, $taxonomy = null) {
+		parent::__construct($factory);
 		$this->taxonomy = $taxonomy ? $taxonomy : self::DEFAULT_TAXONOMY;
 		$this->default_generation_definitions = array(
-			'name' => new WP_UnitTest_Generator_Sequence( 'Term %s' ),
+			'name' => new WP_UnitTest_Generator_Sequence('Term %s'),
 			'taxonomy' => $this->taxonomy,
-			'description' => new WP_UnitTest_Generator_Sequence( 'Term description %s' ),
+			'description' => new WP_UnitTest_Generator_Sequence('Term description %s'),
 		);
 	}
 
-	function create_object( $args ) {
-		$args = array_merge( array( 'taxonomy' => $this->taxonomy ), $args );
-		$term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
-		if ( is_wp_error( $term_id_pair ) ) {
+	function create_object($args) {
+		$args = array_merge(array('taxonomy' => $this->taxonomy), $args);
+		$term_id_pair = wp_insert_term($args['name'], $args['taxonomy'], $args);
+		if (is_wp_error($term_id_pair)) {
 					return $term_id_pair;
 		}
 		return $term_id_pair['term_id'];
 	}
 
-	function update_object( $term, $fields ) {
-		$fields = array_merge( array( 'taxonomy' => $this->taxonomy ), $fields );
-		if ( is_object( $term ) ) {
+	function update_object($term, $fields) {
+		$fields = array_merge(array('taxonomy' => $this->taxonomy), $fields);
+		if (is_object($term)) {
 					$taxonomy = $term->taxonomy;
 		}
-		$term_id_pair = wp_update_term( $term, $taxonomy, $fields );
+		$term_id_pair = wp_update_term($term, $taxonomy, $fields);
 		return $term_id_pair['term_id'];
 	}
 
-	function add_post_terms( $post_id, $terms, $taxonomy, $append = true ) {
-		return wp_set_post_terms( $post_id, $terms, $taxonomy, $append );
+	function add_post_terms($post_id, $terms, $taxonomy, $append = true) {
+		return wp_set_post_terms($post_id, $terms, $taxonomy, $append);
 	}
 
-	function create_and_get( $args = array(), $generation_definitions = null ) {
-		$term_id = $this->create( $args, $generation_definitions );
-		$taxonomy = isset( $args['taxonomy'] ) ? $args['taxonomy'] : $this->taxonomy;
-		return get_term( $term_id, $taxonomy );
+	function create_and_get($args = array(), $generation_definitions = null) {
+		$term_id = $this->create($args, $generation_definitions);
+		$taxonomy = isset($args['taxonomy']) ? $args['taxonomy'] : $this->taxonomy;
+		return get_term($term_id, $taxonomy);
 	}
 
-	function get_object_by_id( $term_id ) {
-		return get_term( $term_id, $this->taxonomy );
+	function get_object_by_id($term_id) {
+		return get_term($term_id, $this->taxonomy);
 	}
 }

tests/phpunit/includes/factory/class-wp-unittest-factory-for-thing.php

Doc Comments +3 added lines

@@ -52,6 +52,9 @@
 
 	abstract function get_object_by_id( $object_id );
 
+	/**
+	 * @param integer $count
+	 */
 	function create_many( $count, $args = array(), $generation_definitions = null ) {
 		$results = array();
 		for ( $i = 0; $i < $count; $i++ ) {

Indentation +109 added lines, -109 removed lines

@@ -5,114 +5,114 @@
  */
 abstract class WP_UnitTest_Factory_For_Thing {
 
-	var $default_generation_definitions;
-	var $factory;
-
-	/**
-	 * Creates a new factory, which will create objects of a specific Thing
-	 *
-	 * @param object $factory Global factory that can be used to create other objects on the system
-	 * @param array $default_generation_definitions Defines what default values should the properties of the object have. The default values
-	 * can be generators -- an object with next() method. There are some default generators: {@link WP_UnitTest_Generator_Sequence},
-	 * {@link WP_UnitTest_Generator_Locale_Name}, {@link WP_UnitTest_Factory_Callback_After_Create}.
-	 */
-	function __construct( $factory, $default_generation_definitions = array() ) {
-		$this->factory = $factory;
-		$this->default_generation_definitions = $default_generation_definitions;
-	}
-
-	abstract function create_object( $args );
-	abstract function update_object( $object, $fields );
-
-	function create( $args = array(), $generation_definitions = null ) {
-		if ( is_null( $generation_definitions ) ) {
-					$generation_definitions = $this->default_generation_definitions;
-		}
-
-		$generated_args = $this->generate_args( $args, $generation_definitions, $callbacks );
-		$created = $this->create_object( $generated_args );
-		if ( !$created || is_wp_error( $created ) ) {
-					return $created;
-		}
-
-		if ( $callbacks ) {
-			$updated_fields = $this->apply_callbacks( $callbacks, $created );
-			$save_result = $this->update_object( $created, $updated_fields );
-			if ( !$save_result || is_wp_error( $save_result ) ) {
-							return $save_result;
-			}
-		}
-		return $created;
-	}
-
-	function create_and_get( $args = array(), $generation_definitions = null ) {
-		$object_id = $this->create( $args, $generation_definitions );
-		return $this->get_object_by_id( $object_id );
-	}
-
-	abstract function get_object_by_id( $object_id );
-
-	function create_many( $count, $args = array(), $generation_definitions = null ) {
-		$results = array();
-		for ( $i = 0; $i < $count; $i++ ) {
-			$results[] = $this->create( $args, $generation_definitions );
-		}
-		return $results;
-	}
-
-	function generate_args( $args = array(), $generation_definitions = null, &$callbacks = null ) {
-		$callbacks = array();
-		if ( is_null( $generation_definitions ) ) {
-					$generation_definitions = $this->default_generation_definitions;
-		}
-
-		// Use the same incrementor for all fields belonging to this object.
-		$gen  = new WP_UnitTest_Generator_Sequence();
-		$incr = $gen->get_incr();
-
-		foreach( array_keys( $generation_definitions ) as $field_name ) {
-			if ( !isset( $args[$field_name] ) ) {
-				$generator = $generation_definitions[$field_name];
-				if ( is_scalar( $generator ) ) {
-					$args[$field_name] = $generator;
-				} elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
-					$callbacks[$field_name] = $generator;
-				} elseif ( is_object( $generator ) ) {
-					$args[ $field_name ] = sprintf( $generator->get_template_string(), $incr );
-				} else {
-					return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
-				}
-			}
-		}
-
-		return $args;
-	}
-
-	function apply_callbacks( $callbacks, $created ) {
-		$updated_fields = array();
-		foreach( $callbacks as $field_name => $generator ) {
-			$updated_fields[$field_name] = $generator->call( $created );
-		}
-		return $updated_fields;
-	}
-
-	function callback( $function ) {
-		return new WP_UnitTest_Factory_Callback_After_Create( $function );
-	}
-
-	function addslashes_deep($value) {
-		if ( is_array( $value ) ) {
-			$value = array_map( array( $this, 'addslashes_deep' ), $value );
-		} elseif ( is_object( $value ) ) {
-			$vars = get_object_vars( $value );
-			foreach ($vars as $key=>$data) {
-				$value->{$key} = $this->addslashes_deep( $data );
-			}
-		} elseif ( is_string( $value ) ) {
-			$value = addslashes( $value );
-		}
-
-		return $value;
-	}
+    var $default_generation_definitions;
+    var $factory;
+
+    /**
+     * Creates a new factory, which will create objects of a specific Thing
+     *
+     * @param object $factory Global factory that can be used to create other objects on the system
+     * @param array $default_generation_definitions Defines what default values should the properties of the object have. The default values
+     * can be generators -- an object with next() method. There are some default generators: {@link WP_UnitTest_Generator_Sequence},
+     * {@link WP_UnitTest_Generator_Locale_Name}, {@link WP_UnitTest_Factory_Callback_After_Create}.
+     */
+    function __construct( $factory, $default_generation_definitions = array() ) {
+        $this->factory = $factory;
+        $this->default_generation_definitions = $default_generation_definitions;
+    }
+
+    abstract function create_object( $args );
+    abstract function update_object( $object, $fields );
+
+    function create( $args = array(), $generation_definitions = null ) {
+        if ( is_null( $generation_definitions ) ) {
+                    $generation_definitions = $this->default_generation_definitions;
+        }
+
+        $generated_args = $this->generate_args( $args, $generation_definitions, $callbacks );
+        $created = $this->create_object( $generated_args );
+        if ( !$created || is_wp_error( $created ) ) {
+                    return $created;
+        }
+
+        if ( $callbacks ) {
+            $updated_fields = $this->apply_callbacks( $callbacks, $created );
+            $save_result = $this->update_object( $created, $updated_fields );
+            if ( !$save_result || is_wp_error( $save_result ) ) {
+                            return $save_result;
+            }
+        }
+        return $created;
+    }
+
+    function create_and_get( $args = array(), $generation_definitions = null ) {
+        $object_id = $this->create( $args, $generation_definitions );
+        return $this->get_object_by_id( $object_id );
+    }
+
+    abstract function get_object_by_id( $object_id );
+
+    function create_many( $count, $args = array(), $generation_definitions = null ) {
+        $results = array();
+        for ( $i = 0; $i < $count; $i++ ) {
+            $results[] = $this->create( $args, $generation_definitions );
+        }
+        return $results;
+    }
+
+    function generate_args( $args = array(), $generation_definitions = null, &$callbacks = null ) {
+        $callbacks = array();
+        if ( is_null( $generation_definitions ) ) {
+                    $generation_definitions = $this->default_generation_definitions;
+        }
+
+        // Use the same incrementor for all fields belonging to this object.
+        $gen  = new WP_UnitTest_Generator_Sequence();
+        $incr = $gen->get_incr();
+
+        foreach( array_keys( $generation_definitions ) as $field_name ) {
+            if ( !isset( $args[$field_name] ) ) {
+                $generator = $generation_definitions[$field_name];
+                if ( is_scalar( $generator ) ) {
+                    $args[$field_name] = $generator;
+                } elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
+                    $callbacks[$field_name] = $generator;
+                } elseif ( is_object( $generator ) ) {
+                    $args[ $field_name ] = sprintf( $generator->get_template_string(), $incr );
+                } else {
+                    return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+                }
+            }
+        }
+
+        return $args;
+    }
+
+    function apply_callbacks( $callbacks, $created ) {
+        $updated_fields = array();
+        foreach( $callbacks as $field_name => $generator ) {
+            $updated_fields[$field_name] = $generator->call( $created );
+        }
+        return $updated_fields;
+    }
+
+    function callback( $function ) {
+        return new WP_UnitTest_Factory_Callback_After_Create( $function );
+    }
+
+    function addslashes_deep($value) {
+        if ( is_array( $value ) ) {
+            $value = array_map( array( $this, 'addslashes_deep' ), $value );
+        } elseif ( is_object( $value ) ) {
+            $vars = get_object_vars( $value );
+            foreach ($vars as $key=>$data) {
+                $value->{$key} = $this->addslashes_deep( $data );
+            }
+        } elseif ( is_string( $value ) ) {
+            $value = addslashes( $value );
+        }
+
+        return $value;
+    }
 
 }

Spacing +40 added lines, -40 removed lines

@@ -16,53 +16,53 @@ 
 	 * can be generators -- an object with next() method. There are some default generators: {@link WP_UnitTest_Generator_Sequence},
 	 * {@link WP_UnitTest_Generator_Locale_Name}, {@link WP_UnitTest_Factory_Callback_After_Create}.
 	 */
-	function __construct( $factory, $default_generation_definitions = array() ) {
+	function __construct($factory, $default_generation_definitions = array()) {
 		$this->factory = $factory;
 		$this->default_generation_definitions = $default_generation_definitions;
 	}
 
-	abstract function create_object( $args );
-	abstract function update_object( $object, $fields );
+	abstract function create_object($args);
+	abstract function update_object($object, $fields);
 
-	function create( $args = array(), $generation_definitions = null ) {
-		if ( is_null( $generation_definitions ) ) {
+	function create($args = array(), $generation_definitions = null) {
+		if (is_null($generation_definitions)) {
 					$generation_definitions = $this->default_generation_definitions;
 		}
 
-		$generated_args = $this->generate_args( $args, $generation_definitions, $callbacks );
-		$created = $this->create_object( $generated_args );
-		if ( !$created || is_wp_error( $created ) ) {
+		$generated_args = $this->generate_args($args, $generation_definitions, $callbacks);
+		$created = $this->create_object($generated_args);
+		if ( ! $created || is_wp_error($created)) {
 					return $created;
 		}
 
-		if ( $callbacks ) {
-			$updated_fields = $this->apply_callbacks( $callbacks, $created );
-			$save_result = $this->update_object( $created, $updated_fields );
-			if ( !$save_result || is_wp_error( $save_result ) ) {
+		if ($callbacks) {
+			$updated_fields = $this->apply_callbacks($callbacks, $created);
+			$save_result = $this->update_object($created, $updated_fields);
+			if ( ! $save_result || is_wp_error($save_result)) {
 							return $save_result;
 			}
 		}
 		return $created;
 	}
 
-	function create_and_get( $args = array(), $generation_definitions = null ) {
-		$object_id = $this->create( $args, $generation_definitions );
-		return $this->get_object_by_id( $object_id );
+	function create_and_get($args = array(), $generation_definitions = null) {
+		$object_id = $this->create($args, $generation_definitions);
+		return $this->get_object_by_id($object_id);
 	}
 
-	abstract function get_object_by_id( $object_id );
+	abstract function get_object_by_id($object_id);
 
-	function create_many( $count, $args = array(), $generation_definitions = null ) {
+	function create_many($count, $args = array(), $generation_definitions = null) {
 		$results = array();
-		for ( $i = 0; $i < $count; $i++ ) {
-			$results[] = $this->create( $args, $generation_definitions );
+		for ($i = 0; $i < $count; $i++) {
+			$results[] = $this->create($args, $generation_definitions);
 		}
 		return $results;
 	}
 
-	function generate_args( $args = array(), $generation_definitions = null, &$callbacks = null ) {
+	function generate_args($args = array(), $generation_definitions = null, &$callbacks = null) {
 		$callbacks = array();
-		if ( is_null( $generation_definitions ) ) {
+		if (is_null($generation_definitions)) {
 					$generation_definitions = $this->default_generation_definitions;
 		}
 
@@ -70,17 +70,17 @@ 
 		$gen  = new WP_UnitTest_Generator_Sequence();
 		$incr = $gen->get_incr();
 
-		foreach( array_keys( $generation_definitions ) as $field_name ) {
-			if ( !isset( $args[$field_name] ) ) {
+		foreach (array_keys($generation_definitions) as $field_name) {
+			if ( ! isset($args[$field_name])) {
 				$generator = $generation_definitions[$field_name];
-				if ( is_scalar( $generator ) ) {
+				if (is_scalar($generator)) {
 					$args[$field_name] = $generator;
-				} elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
+				} elseif (is_object($generator) && method_exists($generator, 'call')) {
 					$callbacks[$field_name] = $generator;
-				} elseif ( is_object( $generator ) ) {
-					$args[ $field_name ] = sprintf( $generator->get_template_string(), $incr );
+				} elseif (is_object($generator)) {
+					$args[$field_name] = sprintf($generator->get_template_string(), $incr);
 				} else {
-					return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+					return new WP_Error('invalid_argument', 'Factory default value should be either a scalar or an generator object.');
 				}
 			}
 		}
@@ -88,28 +88,28 @@ 
 		return $args;
 	}
 
-	function apply_callbacks( $callbacks, $created ) {
+	function apply_callbacks($callbacks, $created) {
 		$updated_fields = array();
-		foreach( $callbacks as $field_name => $generator ) {
-			$updated_fields[$field_name] = $generator->call( $created );
+		foreach ($callbacks as $field_name => $generator) {
+			$updated_fields[$field_name] = $generator->call($created);
 		}
 		return $updated_fields;
 	}
 
-	function callback( $function ) {
-		return new WP_UnitTest_Factory_Callback_After_Create( $function );
+	function callback($function) {
+		return new WP_UnitTest_Factory_Callback_After_Create($function);
 	}
 
 	function addslashes_deep($value) {
-		if ( is_array( $value ) ) {
-			$value = array_map( array( $this, 'addslashes_deep' ), $value );
-		} elseif ( is_object( $value ) ) {
-			$vars = get_object_vars( $value );
+		if (is_array($value)) {
+			$value = array_map(array($this, 'addslashes_deep'), $value);
+		} elseif (is_object($value)) {
+			$vars = get_object_vars($value);
 			foreach ($vars as $key=>$data) {
-				$value->{$key} = $this->addslashes_deep( $data );
+				$value->{$key} = $this->addslashes_deep($data);
 			}
-		} elseif ( is_string( $value ) ) {
-			$value = addslashes( $value );
+		} elseif (is_string($value)) {
+			$value = addslashes($value);
 		}
 
 		return $value;