diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-03-23 17:46:02 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-03-23 17:46:02 +0000 |
| commit | 2e96b99ceb195735a641e299f3209840cc101052 (patch) | |
| tree | 374954833d10017ae7adb6a031d54fd0dc36f3a2 /wp-admin/import | |
| parent | bf6a271edebcceb76d6e378156e92fe72c1fbb18 (diff) | |
| download | wordpress-mu-2e96b99ceb195735a641e299f3209840cc101052.tar.gz wordpress-mu-2e96b99ceb195735a641e299f3209840cc101052.tar.xz wordpress-mu-2e96b99ceb195735a641e299f3209840cc101052.zip | |
Ryan casts an int and catches a fish, someone buy him a pint! merge to 5092
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@933 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/import')
| -rw-r--r-- | wp-admin/import/blogger.php | 2 | ||||
| -rw-r--r-- | wp-admin/import/blogware.php | 2 | ||||
| -rw-r--r-- | wp-admin/import/dotclear.php | 4 | ||||
| -rw-r--r-- | wp-admin/import/livejournal.php | 2 | ||||
| -rw-r--r-- | wp-admin/import/mt.php | 4 | ||||
| -rw-r--r-- | wp-admin/import/wordpress.php | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/wp-admin/import/blogger.php b/wp-admin/import/blogger.php index 4614bf6..fdc6004 100644 --- a/wp-admin/import/blogger.php +++ b/wp-admin/import/blogger.php @@ -546,7 +546,7 @@ class Blogger_Import { }
}
- $comment_post_ID = $this->blogs[$importing_blog]['posts'][$entry->old_post_permalink];
+ $comment_post_ID = (int) $this->blogs[$importing_blog]['posts'][$entry->old_post_permalink];
preg_match('#<name>(.+?)</name>.*(?:\<uri>(.+?)</uri>)?#', $entry->author, $matches);
$comment_author = addslashes( $this->no_apos( strip_tags( (string) $matches[1] ) ) );
$comment_author_url = addslashes( $this->no_apos( strip_tags( (string) $matches[2] ) ) );
diff --git a/wp-admin/import/blogware.php b/wp-admin/import/blogware.php index 2cbf75f..c9e281c 100644 --- a/wp-admin/import/blogware.php +++ b/wp-admin/import/blogware.php @@ -104,7 +104,7 @@ class BW_Import { $comments = $comments[1];
if ( $comments ) {
- $comment_post_ID = $post_id;
+ $comment_post_ID = (int) $post_id;
$num_comments = 0;
foreach ($comments as $comment) {
preg_match('|<body>(.*?)</body>|is', $comment, $comment_content);
diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php index 0eb092b..9a32e3a 100644 --- a/wp-admin/import/dotclear.php +++ b/wp-admin/import/dotclear.php @@ -437,8 +437,8 @@ class Dotclear_Import { extract($comment); // WordPressify Data - $comment_ID = ltrim($comment_id, '0'); - $comment_post_ID = $postarr[$post_id]; + $comment_ID = (int) ltrim($comment_id, '0'); + $comment_post_ID = (int) $postarr[$post_id]; $comment_approved = "$comment_pub"; $name = $wpdb->escape(csc ($comment_auteur)); $email = $wpdb->escape($comment_email); diff --git a/wp-admin/import/livejournal.php b/wp-admin/import/livejournal.php index e1389cd..690005b 100644 --- a/wp-admin/import/livejournal.php +++ b/wp-admin/import/livejournal.php @@ -82,7 +82,7 @@ class LJ_Import { $comments = $comments[1]; if ( $comments ) { - $comment_post_ID = $post_id; + $comment_post_ID = (int) $post_id; $num_comments = 0; foreach ($comments as $comment) { preg_match('|<event>(.*?)</event>|is', $comment, $comment_content); diff --git a/wp-admin/import/mt.php b/wp-admin/import/mt.php index 733c7fa..1effb5c 100644 --- a/wp-admin/import/mt.php +++ b/wp-admin/import/mt.php @@ -154,7 +154,7 @@ class MT_Import { return; } $this->file = $file['file']; - $this->id = $file['id']; + $this->id = (int) $file['id']; $this->get_entries(); $this->mt_authors_form(); @@ -278,7 +278,7 @@ class MT_Import { } } - $comment_post_ID = $post_id; + $comment_post_ID = (int) $post_id; $comment_approved = 1; // Now for comments diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php index 78d972f..90b616b 100644 --- a/wp-admin/import/wordpress.php +++ b/wp-admin/import/wordpress.php @@ -157,7 +157,7 @@ class WP_Import { return;
}
$this->file = $file['file'];
- $this->id = $file['id'];
+ $this->id = (int) $file['id'];
$this->get_entries();
$this->wp_authors_form();
@@ -184,7 +184,7 @@ class WP_Import { if ( empty($parent) )
$category_parent = '0';
else
- $category_parent = (int) category_exists($parent);
+ $category_parent = category_exists($parent);
$catarr = compact('category_nicename', 'category_parent', 'posts_private', 'links_private', 'posts_private', 'cat_name');
|