Changeset 1937

Show
Ignore:
Timestamp:
04/16/08 19:51:34 (3 months ago)
Author:
bchoate
Message:

Preserve any pre-existing page_layout variable through includes, etc. BugId:79314

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1927 r1937  
    221221    $ctx ||= $tmpl->context; 
    222222 
    223     my ($timer, $start); 
    224     if (MT->config->PerformanceLogging) { 
    225         $timer = MT->get_timer(); 
    226     } 
     223    my $timer = MT->get_timer(); 
    227224    local $timer->{elapsed} = 0 if $timer; 
    228225 
    …… 
    231228        or return; 
    232229    my $build = $ctx->{__stash}{builder} || MT::Builder->new; 
     230    my $page_layout; 
    233231    if (my $blog_id = $tmpl->blog_id) { 
    234232        $ctx->stash('blog_id', $blog_id); 
    …… 
    243241        } 
    244242        MT->config->TimeOffset($blog->server_offset); 
    245         $ctx->var( 'page_layout', $blog->page_layout ) 
    246             if $blog->page_layout; 
    247     } 
    248     $ctx->var( 'page_layout', $tmpl->page_layout ) 
    249         if $tmpl->page_layout; 
     243        $page_layout = $blog->page_layout; 
     244    } 
     245    $page_layout = $tmpl->page_layout if $tmpl->page_layout; 
     246    $ctx->var( 'page_layout', $page_layout ) 
     247        unless $ctx->var('page_layout'); 
    250248    if (my $layout = $ctx->var('page_layout')) { 
    251249        my $columns = {