Changeset 1906

Timestamp:

04/15/08 03:24:24 (19 months ago)

Author:

fumiakiy

Message:

Fixed including system template. BugId:79275

Location:

branches/release-35/lib/MT

Files:

• CMS/Tools.pm (modified) (1 diff)
• Template/ContextHandlers.pm (modified) (2 diffs)

branches/release-35/lib/MT/CMS/Tools.pm

@@ -4 +4 @@
 use Symbol;
 
-use MT::I18N qw( encode_text );
+use MT::I18N qw( encode_text wrap_text );
 use MT::Util qw( encode_url encode_html decode_html encode_js );
 

branches/release-35/lib/MT/Template/ContextHandlers.pm

@@ -2302 +2302 @@
     local $include_stack{$stash_id} = 1;
 
-    my $blog = $ctx->stash('blog') || MT->model('blog')->load($blog_id);
-    return unless $blog;
     my $req = MT::Request->instance;
     my ($tmpl, $tokens);
@@ -2330 +2328 @@
         $req->stash($stash_id, [ $tmpl, undef ]);
     }
+
+    my $blog = $ctx->stash('blog') || MT->model('blog')->load($blog_id);
 
     my $use_ssi = $blog && $blog->include_system