Changeset 1823 for branches/release-34/lib/MT/CMS/Blog.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/CMS/Blog.pm (modified) (8 diffs)

branches/release-34/lib/MT/CMS/Blog.pm

@@ -419 +419 @@
     return $app->return_to_dashboard( redirect => 1 ) unless $blog_id;
 
-    my $blog = $app->model('blog')->load($blog_id);
+    my $blog = $app->model('blog')->load($blog_id)
+        or return $app->error($app->translate('Can\'t load blog #[_1].', $blog_id));
     my @data;
     for my $at ( split /\s*,\s*/, $blog->archive_type ) {
@@ -557 +558 @@
     return $app->errtrans("Invalid request.") unless $blog_id;
 
-    my $blog          = MT::Blog->load($blog_id);
+    my $blog          = MT::Blog->load($blog_id)
+        or return $app->error($app->translate('Can\'t load blog #[_1].', $blog_id));
     my $order         = $q->param('type');
     my @order         = split /,/, $order;
@@ -589 +591 @@
                 require MT::Entry;
                 my $entry = MT::Entry->load($obj_id);
-                $edit_type = $entry->class;
+                $edit_type = $entry ? $entry->class : 'entry';
             }
             $app->{goback} =
@@ -803 +805 @@
         if ( $q->param('entry_id') ) {
             require MT::Entry;
-            my $entry = MT::Entry->load( scalar $q->param('entry_id') );
+            my $entry = MT::Entry->load( scalar $q->param('entry_id') )
+                or return $app->error($app->translate('Can\'t load entry #[_1].', $q->param('entry_id')));
             require MT::Blog;
-            my $blog = MT::Blog->load( $entry->blog_id );
+            my $blog = MT::Blog->load( $entry->blog_id )
+                or return $app->error($app->translate('Can\'t load blog #[_1].', $entry->blog_id));
             require MT::CMS::Entry;
             MT::CMS::Entry::ping_continuation( $app,
@@ -942 +946 @@
         my $tmpl_id = $1;
         require MT::Template;
-        my $tmpl = MT::Template->load($tmpl_id);
+        my $tmpl = MT::Template->load($tmpl_id)
+            or return $app->error($app->translate('Can\'t load template #[_1].', $tmpl_id));
         $param{build_type_name} =
           $app->translate( "index template '[_1]'", $tmpl->name );
@@ -950 +955 @@
         my $entry_id = $1;
         require MT::Entry;
-        my $entry = MT::Entry->load($entry_id);
+        my $entry = MT::Entry->load($entry_id)
+            or return $app->error($app->translate('Can\'t load entry #[_1].', $entry_id));
         $param{build_type_name} =
           $app->translate( "[_1] '[_2]'", $entry->class_label, $entry->title );
@@ -969 +975 @@
     my $blog_id = $app->param('blog_id');
     require MT::Blog;
-    my $blog = MT::Blog->load($blog_id);
+    my $blog = MT::Blog->load($blog_id)
+        or return $app->error($app->translate('Can\'t load blog #[_1].', $blog_id));
     my $at = $blog->archive_type || '';
     my ( @blog_at, @at, @data );
@@ -1007 +1014 @@
     if ( my $tmpl_id = $app->param('tmpl_id') ) {
         require MT::Template;
-        my $tmpl = MT::Template->load($tmpl_id);
+        my $tmpl = MT::Template->load($tmpl_id)
+            or return $app->error($app->translate('Can\'t load template #[_1].', $tmpl_id));
         $param{index_tmpl_id}   = $tmpl->id;
         $param{index_tmpl_name} = $tmpl->name;