Removed iframe from kses whitelist

Minor translation change in wordpress importer


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

2 files changed, 1 insertions, 13 deletions

diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php
index 028cbf0..78d972f 100644
--- a/wp-admin/import/wordpress.php
+++ b/wp-admin/import/wordpress.php
@@ -136,7 +136,7 @@ class WP_Import {
 		$j = -1;

 		foreach ($authors as $author) {

 			++ $j;

-			echo '<li>Current author: <strong>'.$author.'</strong><br />'.'Map to existing: ';

+			echo '<li>'.__('Current author:').' <strong>'.$author.'</strong><br />'.'Map to existing: ';

 			$this->users_form($j);

 			echo '</li>';

 		}

diff --git a/wp-includes/kses.php b/wp-includes/kses.php
index f0a5771..aa9e465 100644
--- a/wp-includes/kses.php
+++ b/wp-includes/kses.php
@@ -110,18 +110,6 @@ if (!CUSTOM_TAGS) {
 			'size' => array (),
 			'width' => array ()),
 		'i' => array (),
-		'iframe' => array ( // This is filtered to whitelisted domains later according to Andy
-			'longdesc' => array(),
-			'name' => array(),
-			'src' => array(),
-			'frameborder' => array(),
-			'marginwidth' => array(),
-			'marginheight' => array(),
-			'scroll' => array(),
-			'scrolling' => array(),
-			'align' => array(),
-			'height' => array(),
-			'width' => array ()),
 		'img' => array (
 			'alt' => array (),
 			'align' => array (),