WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@638 7be80a69-a1ef-0310-a953-fb0f7c49ff36

4 files changed, 19 insertions, 19 deletions

diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php
index f79a164..68541b0 100644
--- a/wp-admin/import/blogger.php
+++ b/wp-admin/import/blogger.php
@@ -246,7 +246,7 @@ class Blogger_Import {
 			$blogsary = array();

 			preg_match_all('#posts\.g\?blogID=(\d+)">([^<]+)</a>#U', $response['body'], $blogsary);

 			if ( ! count( $blogsary[1] < 1 ) )

-				die(__('No blogs found for this user.'));

+				wp_die(__('No blogs found for this user.'));

 			$this->import['blogs'] = array();

 			$template = '<!--<MainPage><BloggerArchives><a class="wparchive" href="<$BlogArchiveURL$>"><$BlogArchiveName$></a><br /></BloggerArchives></MainPage><ArchivePage><Blogger><wordpresspost><$BlogItemDateTime$>|W|P|<$BlogItemAuthorNickname$>|W|P|<$BlogItemBody$>|W|P|<$BlogItemNumber$>|W|P|<$BlogItemTitle$>|W|P|<$BlogItemAuthorEmail$><BlogItemCommentsEnabled><BlogItemComments><wordpresscomment><$BlogCommentDateTime$>|W|P|<$BlogCommentAuthor$>|W|P|<$BlogCommentBody$></BlogItemComments></BlogItemCommentsEnabled></Blogger></ArchivePage>-->';

 			foreach ( $blogsary[1] as $key => $id ) {

@@ -311,7 +311,7 @@ class Blogger_Import {
 						if ( $_POST['publishMode'] > 0 ) {

 							$response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode=0", $headers);

 							if ( $response['code'] >= 400 )

-								die('<h2>'.__('Failed attempt to change publish mode from FTP to BlogSpot.').'</h2><pre>' . addslashes(print_r($headers, 1)) . addslashes(print_r($response, 1)) . '</pre>');

+								wp_die('<h2>'.__('Failed attempt to change publish mode from FTP to BlogSpot.').'</h2><pre>' . addslashes(print_r($headers, 1)) . addslashes(print_r($response, 1)) . '</pre>');

 							$this->import['blogs'][$_GET['blog']]['url'] = 'http://' . $optary['modify']['subdomain'] . '.blogspot.com/';

 							sleep(2);

 						} else {

@@ -329,7 +329,7 @@ class Blogger_Import {
 					}

 					$response = $this->post_blogger($posturl, $headers, $paramary);

 					if ( $response['code'] >= 400 || strstr($response['body'], 'There are errors on this form') )

-						die('<p>'.__('Error on form submission. Retry or reset the importer.').'</p>' . addslashes(print_r($response, 1)));

+						wp_die('<p>'.__('Error on form submission. Retry or reset the importer.').'</p>' . addslashes(print_r($response, 1)));

 				}

 				$output .= "<del><p>$blog_opt</p></del>\n";

 			} elseif ( is_array($this->import['blogs'][$_GET['blog']]['options']["$blog_opt"]['backup']) ) {

@@ -372,7 +372,7 @@ class Blogger_Import {
 	function get_archive_urls() {

 		$bloghtml = $this->get_blogger($this->import['blogs'][$_GET['blog']]['url']);

 		if (! strstr($bloghtml['body'], '<a class="wparchive"') )

-			die(__('Your Blogger blog did not take the new template or did not respond.'));

+			wp_die(__('Your Blogger blog did not take the new template or did not respond.'));

 		preg_match_all('#<a class="wparchive" href="([^"]*)"#', $bloghtml['body'], $archives);

 		foreach ($archives[1] as $archive) {

 			$this->import['blogs'][$_GET['blog']]['archives'][$archive] = false;

@@ -554,7 +554,7 @@ class Blogger_Import {
 						$response = $this->get_blogger("http://www.blogger.com/blog-publishing.g?blogID={$_GET['blog']}&publishMode={$optary['backup']['publishMode']}", $headers);

 						sleep(2);

 						if ( $response['code'] >= 400 )

-							die('<h1>Error restoring publishMode.</h1><p>Please tell the devs.</p>' . addslashes(print_r($response, 1)) );

+							wp_die('<h1>Error restoring publishMode.</h1><p>Please tell the devs.</p>' . addslashes(print_r($response, 1)) );

 					}

 				}

 				if ( $optary['backup'] != $optary['modify'] ) {

@@ -623,7 +623,7 @@ class Blogger_Import {
 				$step = 0;

 			}

 //echo "Step $step.";

-//die('<pre>'.print_r($this->import,1).'</pre');

+//wp_die('<pre>'.print_r($this->import,1).'</pre');

 			switch ($step) {

 				case 0 :

 					$this->do_login();

diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php
index 9dc8a6e..27ce6e6 100644
--- a/wp-admin/import/dotclear.php
+++ b/wp-admin/import/dotclear.php
@@ -646,12 +646,12 @@ class Dotclear_Import {
 	function db_form()
 	{
 		echo '<ul>';
-		printf('<li><label for="dbuser">%s</label> <input type="text" name="dbuser" /></li>', __('Dotclear Database User:'));
-		printf('<li><label for="dbpass">%s</label> <input type="password" name="dbpass" /></li>', __('Dotclear Database Password:'));
-		printf('<li><label for="dbname">%s</label> <input type="text" name="dbname" /></li>', __('Dotclear Database Name:'));
-		printf('<li><label for="dbhost">%s</label> <input type="text" name="dbhost" value="localhost" /></li>', __('Dotclear Database Host:'));
-		printf('<li><label for="dbprefix">%s</label> <input type="text" name="dbprefix" value="dc_"/></li>', __('Dotclear Table prefix:'));
-		printf('<li><label for="dccharset">%s</label> <input type="text" name="dccharset" value="ISO-8859-15"/></li>', __('Originating character set:'));
+		printf('<li><label for="dbuser">%s</label> <input type="text" name="dbuser" id="dbuser" /></li>', __('Dotclear Database User:'));
+		printf('<li><label for="dbpass">%s</label> <input type="password" name="dbpass" id="dbpass" /></li>', __('Dotclear Database Password:'));
+		printf('<li><label for="dbname">%s</label> <input type="text" name="dbname" id="dbname" /></li>', __('Dotclear Database Name:'));
+		printf('<li><label for="dbhost">%s</label> <input type="text" name="dbhost" nameid="dbhost" value="localhost" /></li>', __('Dotclear Database Host:'));
+		printf('<li><label for="dbprefix">%s</label> <input type="text" name="dbprefix" id="dbprefix" value="dc_"/></li>', __('Dotclear Table prefix:'));
+		printf('<li><label for="dccharset">%s</label> <input type="text" name="dccharset" id="dccharset" value="ISO-8859-15"/></li>', __('Originating character set:'));
 		echo '</ul>';
 	}
 
diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php
index f2b4e2d..8f7b34a 100644
--- a/wp-admin/import/greymatter.php
+++ b/wp-admin/import/greymatter.php
@@ -87,10 +87,10 @@ class GM_Import {
 		}
 
 		if (!chdir($archivespath))
-			die("Wrong path, $archivespath\ndoesn't exist\non the server");
+			wp_die("Wrong path, $archivespath\ndoesn't exist\non the server");
 
 		if (!chdir($gmpath))
-			die("Wrong path, $gmpath\ndoesn't exist\non the server");
+			wp_die("Wrong path, $gmpath\ndoesn't exist\non the server");
 			
 		$this->header();
 ?>
diff --git a/wp-admin/import/textpattern.php b/wp-admin/import/textpattern.php
index 17cae87..4a123de 100644
--- a/wp-admin/import/textpattern.php
+++ b/wp-admin/import/textpattern.php
@@ -569,11 +569,11 @@ class Textpattern_Import {
 	function db_form()
 	{
 		echo '<ul>';
-		printf('<li><label for="dbuser">%s</label> <input type="text" name="dbuser" /></li>', __('Textpattern Database User:'));
-		printf('<li><label for="dbpass">%s</label> <input type="password" name="dbpass" /></li>', __('Textpattern Database Password:'));
-		printf('<li><label for="dbname">%s</label> <input type="text" name="dbname" /></li>', __('Textpattern Database Name:'));
-		printf('<li><label for="dbhost">%s</label> <input type="text" name="dbhost" value="localhost" /></li>', __('Textpattern Database Host:'));
-		printf('<li><label for="dbprefix">%s</label> <input type="text" name="dbprefix" /></li>', __('Textpattern Table prefix (if any):'));
+		printf('<li><label for="dbuser">%s</label> <input type="text" name="dbuser" id="dbuser" /></li>', __('Textpattern Database User:'));
+		printf('<li><label for="dbpass">%s</label> <input type="password" name="dbpass" id="dbpass" /></li>', __('Textpattern Database Password:'));
+		printf('<li><label for="dbname">%s</label> <input type="text" id="dbname" name="dbname" /></li>', __('Textpattern Database Name:'));
+		printf('<li><label for="dbhost">%s</label> <input type="text" id="dbhost" name="dbhost" value="localhost" /></li>', __('Textpattern Database Host:'));
+		printf('<li><label for="dbprefix">%s</label> <input type="text" name="dbprefix" id="dbprefix"  /></li>', __('Textpattern Table prefix (if any):'));
 		echo '</ul>';
 	}