Changeset 3529 for trunk/lib/MT/Blog.pm

Timestamp:

03/12/09 05:46:37 (9 months ago)

Author:

fumiakiy

Message:

Merging frampton to trunk. "svn merge -r3083:3217 http://code.sixapart.com/svn/movabletype/branches/frampton ."

Also merged MT.pm, mt-check.cgi and mt.php.

Files:

• trunk/lib/MT/Blog.pm (modified) (3 diffs)

trunk/lib/MT/Blog.pm

@@ -222 +222 @@
     my $blog = shift;
 
+    my $app = MT->instance;
+    my $curr_lang = $app->current_language;
+    $app->set_language($blog->language);
+
     require MT::DefaultTemplates;
     my $tmpl_list = MT::DefaultTemplates->templates( @_ );
-    return $blog->error(MT->translate("No default templates were found."))
-        if !$tmpl_list || (ref($tmpl_list) ne 'ARRAY') || (!@$tmpl_list);
+    if ( !$tmpl_list || (ref($tmpl_list) ne 'ARRAY') || (!@$tmpl_list) ) {
+        $app->set_language($curr_lang);
+        return $blog->error(MT->translate("No default templates were found."));
+    }
 
     require MT::Template;
@@ -293 +299 @@
     );
 
+    $app->set_language($curr_lang);
     return $blog;
 }
@@ -873 +880 @@
             $tmpl_processor->($new_blog_id, \$counter, $tmpl, \%tmpl_map);
             my @new_widgets;
-            push @new_widgets, $tmpl_map{$_}
-                foreach @old_widgets;
+            foreach ( @old_widgets ) {
+                if ( exists $tmpl_map{$_} ) {
+                    push @new_widgets, $tmpl_map{$_};
+                }
+                else {
+                    my $global_widget = MT::Template->load( $_ );
+                    push @new_widgets, $_
+                      if $global_widget
+                      && $global_widget->blog_id == 0
+                      && $global_widget->type eq 'widget'
+                }
+            }
             $tmpl->modulesets( join(',', @new_widgets) );
             $tmpl->save;