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

Timestamp:

03/12/09 09:11:52 (9 months ago)

Author:

fumiakiy

Message:

Merged sockfish to trunk. "svn merge -r3114:3527 http://code.sixapart.com/svn/movabletype/branches/sockfish/ ."

Files:

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

trunk/lib/MT/WeblogPublisher.pm

@@ -1 @@
-# Movable Type (r) Open Source (C) 2001-2008 Six Apart, Ltd.
+# Movable Type (r) Open Source (C) 2001-2009 Six Apart, Ltd.
 # This program is distributed under the terms of the
 # GNU General Public License, version 2.
@@ -505 +505 @@
                     Blog        => $blog->id,
                     (
-                        $archiver->author_based()
-                        ? ( author_id => $entry->author->id )
+                        $archiver->author_based() && $entry->author_id
+                        ? ( author_id => $entry->author_id )
                         : ()
                     ),
@@ -520 +520 @@
             else {
                 if ( $app->config('RebuildAtDelete') ) {
-                    if ( $archiver->author_based() ) {
+                    if ( $archiver->author_based() && $entry->author_id ) {
                         if ( $archiver->date_based() ) {
                             $rebuild_recipe{$at}{ $entry->author->id }
@@ -1100 +1100 @@
 
     $ctx->{__stash}{blog} = $blog;
+    $ctx->{__stash}{local_blog_id} = $blog->id;
 
     require MT::FileInfo;