Changeset 1833

Show
Ignore:
Timestamp:
04/10/08 11:01:03 (5 months ago)
Author:
takayama
Message:

Fixed BugId:78952
* Added blog_id check for blog loading

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/release-34/lib/MT/Bootstrap.pm

    r1174 r1833  
    8787                $charset = $app->{cfg}->PublishCharset; 
    8888            }; 
    89             if ($app && UNIVERSAL::isa($app, 'MT::App')) { 
     89            if ($app && UNIVERSAL::isa($app, 'MT::App') && !UNIVERSAL::isa($app, 'MT::App::Wizard')) { 
    9090                eval { 
    9191                    # line __LINE__ __FILE__ 

  • branches/release-34/lib/MT/Template/ContextHandlers.pm

    r1830 r1833  
    11101110    my $rebuild = $args->{rebuild} || ''; 
    11111111    my $blog_id = $ctx->var('blog_id'); 
    1112     my $blog = $ctx->stash('blog') || MT->model('blog')->load($blog_id); 
     1112    my $blog = $ctx->stash('blog'); 
     1113    if (!$blog && $blog_id) { 
     1114        $blog = MT->model('blog')->load($blog_id); 
     1115    } 
    11131116    $rebuild = '' if $blog && $blog->custom_dynamic_templates eq 'all'; 
    11141117    $rebuild = qq{<__trans phrase="[_1]Publish[_2] your site to see these changes take effect." params="<a href="javascript:void(0);" class="rebuild-link" onclick="doRebuild('$blog_id');">%%</a>">} if $rebuild eq 'all';