diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-08-31 14:55:29 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-08-31 14:55:29 +0000 |
| commit | b764f60728be1d4e026f9d7ae618ab47e23322f8 (patch) | |
| tree | 1f1b45c4f1c1cf027b3240f605346e56209be8ff /wp-admin/import | |
| parent | dad010666b767a1d06588d1d09c771c62f67c387 (diff) | |
| download | wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.tar.gz wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.tar.xz wordpress-mu-b764f60728be1d4e026f9d7ae618ab47e23322f8.zip | |
WP Merge to rev #4147
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@729 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/import')
| -rw-r--r-- | wp-admin/import/blogger.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php index 68541b0..6328f16 100644 --- a/wp-admin/import/blogger.php +++ b/wp-admin/import/blogger.php @@ -24,7 +24,7 @@ class Blogger_Import { function reencode($text) {
return $text;
- return mb_convert_encoding($text, get_setting('blog_charset'), $this->import['blogs'][$_GET['blog']]['options']['blog-formatting']['backup']['encoding']);
+ return mb_convert_encoding($text, get_option('blog_charset'), $this->import['blogs'][$_GET['blog']]['options']['blog-formatting']['backup']['encoding']);
}
// Deletes saved data and redirect.
@@ -609,7 +609,7 @@ class Blogger_Import { if ( isset($_GET['noheader']) ) {
header('Content-Type: text/html; charset=utf-8');
- $this->import = get_settings('import-blogger');
+ $this->import = get_option('import-blogger');
if ( false === $this->import ) {
$step = 0;
|