Changeset 3082 for trunk/lib/MT/WeblogPublisher.pm

Timestamp:

10/03/08 01:07:01 (14 months ago)

Author:

bchoate

Message:

Merging fireball branch changes to-date to trunk: svn merge -r2974:3081 http://code.sixapart.com/svn/movabletype/branches/fireball .

Files:

• trunk/lib/MT/WeblogPublisher.pm (modified) (2 diffs)

trunk/lib/MT/WeblogPublisher.pm

@@ -1416 +1416 @@
     require MT::Template::Context;
     require MT::Entry;
+
     my $blog;
-    unless ( $blog = $param{Blog} ) {
+    $blog = $param{Blog}
+        if defined $param{Blog};
+    if (!$blog && defined $param{BlogID}) {
         my $blog_id = $param{BlogID};
         $blog = MT::Blog->load($blog_id)
@@ -1428 +1431 @@
     }
     my $tmpl = $param{Template};
-    unless ($blog) {
+    if ($tmpl && (!$blog || $blog->id != $tmpl->blog_id)) {
         $blog = MT::Blog->load( $tmpl->blog_id );
     }
+
+    return $mt->error(
+        MT->translate(
+            "Blog, BlogID or Template param must be specified.")
+    ) unless $blog;
+
     return 1 if $blog->is_dynamic;
     my $iter;