Index: branches/release-35/lib/MT/Template.pm
===================================================================
--- branches/release-35/lib/MT/Template.pm (revision 1927)
+++ branches/release-35/lib/MT/Template.pm (revision 1937)
@@ -221,8 +221,5 @@
     $ctx ||= $tmpl->context;
 
-    my ($timer, $start);
-    if (MT->config->PerformanceLogging) {
-        $timer = MT->get_timer();
-    }
+    my $timer = MT->get_timer();
     local $timer->{elapsed} = 0 if $timer;
 
@@ -231,4 +228,5 @@
         or return;
     my $build = $ctx->{__stash}{builder} || MT::Builder->new;
+    my $page_layout;
     if (my $blog_id = $tmpl->blog_id) {
         $ctx->stash('blog_id', $blog_id);
@@ -243,9 +241,9 @@
         }
         MT->config->TimeOffset($blog->server_offset);
-        $ctx->var( 'page_layout', $blog->page_layout )
-            if $blog->page_layout;
-    }
-    $ctx->var( 'page_layout', $tmpl->page_layout )
-        if $tmpl->page_layout;
+        $page_layout = $blog->page_layout;
+    }
+    $page_layout = $tmpl->page_layout if $tmpl->page_layout;
+    $ctx->var( 'page_layout', $page_layout )
+        unless $ctx->var('page_layout');
     if (my $layout = $ctx->var('page_layout')) {
         my $columns = {