Changeset 1823 for branches/release-34/lib/MT/XMLRPCServer.pm

Timestamp:

04/09/08 10:05:12 (20 months ago)

Author:

takayama

Message:

Fixed BugId:67959
* Added check for result of object loading

Files:

• branches/release-34/lib/MT/XMLRPCServer.pm (modified) (5 diffs)

branches/release-34/lib/MT/XMLRPCServer.pm

@@ -607 +607 @@
     die _fault(MT->translate("Invalid login")) unless $author;
     die _fault(MT->translate("Permission denied.")) unless $perms && $perms->can_create_post;
-    require MT::Blog;
-    my $blog = MT::Blog->load($blog_id);
     my $iter = MT->model($obj_type)->load_iter({ blog_id => $blog_id },
         { 'sort' => 'authored_on',
@@ -740 +738 @@
     my $co = sprintf "%04d%02d%02dT%02d:%02d:%02d",
         unpack 'A4A2A2A2A2A2', $entry->authored_on;
-    require MT::Blog;
-    my $blog = MT::Blog->load($entry->blog_id);
     my $link = $entry->permalink;
     require MT::Tag;
@@ -1016 +1012 @@
     my $author = $class->_login($user, $pass);
     die _fault(MT->translate("Invalid login")) unless $author;
-    my $blog = MT::Blog->load($blog_id);
+    my $blog = MT::Blog->load($blog_id)
+        or die _fault(MT->translate('Can\'t load blog #[_1].', $blog_id));
 
     my $now = time;
@@ -1042 +1039 @@
     foreach my $entry_id (@queue) {
         my $entry = MT::Entry->load($entry_id);
-        if ($entry->authored_on <= $now) {
+        if ($entry && $entry->authored_on <= $now) {
             $entry->status(MT::Entry::RELEASE());
             $entry->discover_tb_from_entry();
@@ -1104 +1101 @@
     require MT::Blog;
     require File::Spec;
-    my $blog = MT::Blog->load($blog_id);
+    my $blog = MT::Blog->load($blog_id)
+        or die _fault(MT->translate('Can\'t load blog #[_1].', $blog_id));
+
     my $fname = $file->{name} or die _fault(MT->translate("No filename provided"));
     if ($fname =~ m!\.\.|\0|\|!) {