site_iri: comparison web/wp-admin/import/wordpress.php

equal deleted inserted replaced

-:a4642baaf829
+:4d4862461b8d
 	var $allauthornames = array ();
 	var $author_ids = array ();
 	var $tags = array ();
 	var $categories = array ();
+	var $terms = array ();
 	var $j = -1;
 	var $fetch_attachments = false;
 	var $url_remap = array ();
 					continue;
 				}
 				if ( false !== strpos($importline, '<wp:tag>') ) {
 					preg_match('|<wp:tag>(.*?)</wp:tag>|is', $importline, $tag);
 					$this->tags[] = $tag[1];
+					continue;
+				}
+				if ( false !== strpos($importline, '<wp:term>') ) {
+					preg_match('|<wp:term>(.*?)</wp:term>|is', $importline, $term);
+					$this->terms[] = $term[1];
 					continue;
 				}
 				if ( false !== strpos($importline, '<item>') ) {
 					$this->post = '';
 					$doing_entry = true;
 	}
 	function wp_authors_form() {
 ?>
-<?php screen_icon(); ?>
 <h2><?php _e('Assign Authors'); ?></h2>
 <p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.'); ?></p>
 <?php
 	if ( $this->allow_create_users() ) {
 		echo '<p>'.__('If a new user is created by WordPress, a password will be randomly generated. Manually change the user&#8217;s details if necessary.')."</p>\n";
 		$authors = $this->get_wp_authors();
 		echo '<form action="?import=wordpress&amp;step=2&amp;id=' . $this->id . '" method="post">';
 		wp_nonce_field('import-wordpress');
-		echo '<ol id="authors">';
+?>
+<ol id="authors">
+<?php
 		$j = -1;
 		foreach ($authors as $author) {
 			++ $j;
 			echo '<li>'.__('Import author:').' <strong>'.$author.'</strong><br />';
 			$this->users_form($j, $author);
 		}
 		if ( $this->allow_fetch_attachments() ) {
 ?>
 </ol>
-<?php screen_icon(); ?>
 <h2><?php _e('Import Attachments'); ?></h2>
 <p>
 	<input type="checkbox" value="1" name="attachments" id="import-attachments" />
 	<label for="import-attachments"><?php _e('Download and import file attachments') ?></label>
 </p>
 			$tagarr = compact('slug', 'description');
 			$tag_ID = wp_insert_term($tag_name, 'post_tag', $tagarr);
 		}
 	}
+	function process_terms() {
+		global $wpdb, $wp_taxonomies;
+		$custom_taxonomies = $wp_taxonomies;
+		// get rid of the standard taxonomies
+		unset( $custom_taxonomies['category'] );
+		unset( $custom_taxonomies['post_tag'] );
+		unset( $custom_taxonomies['link_category'] );
+		$custom_taxonomies = array_keys( $custom_taxonomies );
+		$current_terms = (array) get_terms( $custom_taxonomies, 'get=all' );
+		$taxonomies = array();
+		foreach ( $current_terms as $term ) {
+			if ( isset( $_terms[$term->taxonomy] ) ) {
+				$taxonomies[$term->taxonomy] = array_merge( $taxonomies[$term->taxonomy], array($term->name) );
+			} else {
+				$taxonomies[$term->taxonomy] = array($term->name);
+			}
+		}
+		while ( $c = array_shift($this->terms) ) {
+			$term_name = trim($this->get_tag( $c, 'wp:term_name' ));
+			$term_taxonomy = trim($this->get_tag( $c, 'wp:term_taxonomy' ));
+			// If the term exists in the taxonomy we leave it alone
+			if ( isset($taxonomies[$term_taxonomy] ) && in_array( $term_name, $taxonomies[$term_taxonomy] ) )
+				continue;
+			$slug = $this->get_tag( $c, 'wp:term_slug' );
+			$description = $this->get_tag( $c, 'wp:term_description' );
+			$termarr = compact('slug', 'description');
+			$term_ID = wp_insert_term($term_name, $this->get_tag( $c, 'wp:term_taxonomy' ), $termarr);
+		}
+	}
 	function process_author($post) {
 		$author = $this->get_tag( $post, 'dc:creator' );
 		if ($author)
 			$this->allauthornames[] = $author;
 		wp_import_cleanup($this->id);
 		do_action('import_done', 'wordpress');
 		echo '<h3>'.sprintf(__('All done.').' <a href="%s">'.__('Have fun!').'</a>', get_option('home')).'</h3>';
+	}
+	function _normalize_tag( $matches ) {
+		return '<' . strtolower( $matches[1] );
 	}
 	function process_post($post) {
 		global $wpdb;
 		$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]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $post_excerpt);
+		$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]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $post_content);
+		$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);
 		preg_match_all('|<category domain="tag">(.*?)</category>|is', $post, $tags);
 		$tags = $tags[1];
 					return $post_id;
 			}
 			else {
 				printf(__('Importing post <em>%s</em>...'), stripslashes($post_title));
 				$comment_post_ID = $post_id = wp_insert_post($postdata);
+				if ( $post_id && $is_sticky == 1 )
+					stick_post( $post_id );
 			}
 			if ( is_wp_error( $post_id ) )
 				return $post_id;
 		// Now for comments
 		preg_match_all('|<wp:comment>(.*?)</wp:comment>|is', $post, $comments);
 		$comments = $comments[1];
 		$num_comments = 0;
-		if ( $comments) { foreach ($comments as $comment) {
+		$inserted_comments = array();
-			$comment_author       = $this->get_tag( $comment, 'wp:comment_author');
+		if ( $comments) {
-			$comment_author_email = $this->get_tag( $comment, 'wp:comment_author_email');
+			foreach ($comments as $comment) {
-			$comment_author_IP    = $this->get_tag( $comment, 'wp:comment_author_IP');
+				$comment_id	= $this->get_tag( $comment, 'wp:comment_id');
-			$comment_author_url   = $this->get_tag( $comment, 'wp:comment_author_url');
+				$newcomments[$comment_id]['comment_post_ID']      = $comment_post_ID;
-			$comment_date         = $this->get_tag( $comment, 'wp:comment_date');
+				$newcomments[$comment_id]['comment_author']       = $this->get_tag( $comment, 'wp:comment_author');
-			$comment_date_gmt     = $this->get_tag( $comment, 'wp:comment_date_gmt');
+				$newcomments[$comment_id]['comment_author_email'] = $this->get_tag( $comment, 'wp:comment_author_email');
-			$comment_content      = $this->get_tag( $comment, 'wp:comment_content');
+				$newcomments[$comment_id]['comment_author_IP']    = $this->get_tag( $comment, 'wp:comment_author_IP');
-			$comment_approved     = $this->get_tag( $comment, 'wp:comment_approved');
+				$newcomments[$comment_id]['comment_author_url']   = $this->get_tag( $comment, 'wp:comment_author_url');
-			$comment_type         = $this->get_tag( $comment, 'wp:comment_type');
+				$newcomments[$comment_id]['comment_date']         = $this->get_tag( $comment, 'wp:comment_date');
-			$comment_parent       = $this->get_tag( $comment, 'wp:comment_parent');
+				$newcomments[$comment_id]['comment_date_gmt']     = $this->get_tag( $comment, 'wp:comment_date_gmt');
+				$newcomments[$comment_id]['comment_content']      = $this->get_tag( $comment, 'wp:comment_content');
-			// if this is a new post we can skip the comment_exists() check
+				$newcomments[$comment_id]['comment_approved']     = $this->get_tag( $comment, 'wp:comment_approved');
-			if ( !$post_exists || !comment_exists($comment_author, $comment_date) ) {
+				$newcomments[$comment_id]['comment_type']         = $this->get_tag( $comment, 'wp:comment_type');
-				$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_author_email', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_approved', 'comment_type', 'comment_parent');
+				$newcomments[$comment_id]['comment_parent'] 	  = $this->get_tag( $comment, 'wp:comment_parent');
-				wp_insert_comment($commentdata);
+			}
-				$num_comments++;
+			// Sort by comment ID, to make sure comment parents exist (if there at all)
-			}
+			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);
+					$num_comments++;
+				}
+			}
+		}
 		if ( $num_comments )
 			printf(' '._n('(%s comment)', '(%s comments)', $num_comments), $num_comments);
 		// Now for post meta
 		$this->get_authors_from_post();
 		wp_suspend_cache_invalidation(true);
 		$this->get_entries();
 		$this->process_categories();
 		$this->process_tags();
+		$this->process_terms();
 		$result = $this->process_posts();
 		wp_suspend_cache_invalidation(false);
 		$this->backfill_parents();
 		$this->backfill_attachment_urls();
 		$this->import_end();

branch	wordpress
changeset 132	4d4862461b8d
parent 109	03b0d1493584