diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-05 10:50:39 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-05 10:50:39 +0000 |
| commit | 11571c1befd735bd1d69caea2b093164215b4fee (patch) | |
| tree | 39838b47fd31c93fefcf79e9db725c917ac0c51b /wp-admin | |
| parent | 861bd9122e6d9ee710df2b6fc0a1222a8a8965cf (diff) | |
| download | wordpress-mu-11571c1befd735bd1d69caea2b093164215b4fee.tar.gz wordpress-mu-11571c1befd735bd1d69caea2b093164215b4fee.tar.xz wordpress-mu-11571c1befd735bd1d69caea2b093164215b4fee.zip | |
WP merge to 4681
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@831 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin')
| -rw-r--r-- | wp-admin/import/blogger.php | 7 | ||||
| -rw-r--r-- | wp-admin/options-permalink.php | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php index 6ba0a16..80a2d11 100644 --- a/wp-admin/import/blogger.php +++ b/wp-admin/import/blogger.php @@ -7,14 +7,15 @@ class Blogger_Import { // Shows the welcome screen and the magic iframe.
function greet() {
- $title = __('Import Blogger or Blogspot');
- $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.');
+ $title = __('Import Old Blogger');
+ $welcome = __('Howdy! This importer allows you to import posts and comments from your Old Blogger account into your WordPress blog.');
$noiframes = __('This feature requires iframe support.');
$warning = js_escape(__('This will delete everything saved by the Blogger importer except your posts and comments. Are you sure you want to do this?'));
$reset = __('Reset this importer');
$incompat = __('Your web server is not properly configured to use this importer. Please enable the CURL extension for PHP and then reload this page.');
echo "<div class='wrap'><h2>$title</h2><p>$welcome</p>";
+ echo "<p>" . __('Please note that this importer <em>does not work with new Blogger (using your Google account)</em>.') . "</p>";
if ( function_exists('curl_init') )
echo "<iframe src='admin.php?import=blogger&noheader=true' height='350px' width = '99%'>$noiframes</iframe><p><a href='admin.php?import=blogger&restart=true&noheader=true' onclick='return confirm(\"$warning\")'>$reset</a></p>";
else
@@ -670,6 +671,6 @@ class Blogger_Import { $blogger_import = new Blogger_Import();
-register_importer('blogger', __('Blogger or Blog*Spot'), __('Import posts, comments, and users from a Blogger or Blog*Spot blog'), array ($blogger_import, 'start'));
+register_importer('blogger', __('Old Blogger'), __('Import posts, comments, and users from an Old Blogger blog'), array ($blogger_import, 'start'));
?>
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index fe3f87a..200cabe 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -169,7 +169,7 @@ checked="checked" <form action="options-permalink.php" method="post"> <?php wp_nonce_field('update-permalink') ?> <p> -<textarea rows="5" style="width: 98%;" name="rules"><?php echo $wp_rewrite->mod_rewrite_rules(); ?> +<textarea rows="5" style="width: 98%;" name="rules"><?php echo wp_specialchars($wp_rewrite->mod_rewrite_rules()); ?> </textarea> </p> </form> |