Changeset 2772

Show
Ignore:
Timestamp:
07/14/08 19:59:34 (3 months ago)
Author:
bchoate
Message:

Fixed presentation issue with certain runtime errors.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/release-41/lib/MT/App.pm

    r2745 r2772  
    20912091    } 
    20922092    $tmpl = $app->load_tmpl('error.tmpl') or 
    2093         return "Can't load error template; got error '" . $app->errstr . 
     2093        return "Can't load error template; got error '" . encode_html( $app->errstr ) . 
    20942094               "'. Giving up. Original error was <pre>$param->{error}</pre>"; 
    20952095    my $type = $app->param('__type') || ''; 
    …… 
    21062106    my $out = $tmpl->output; 
    21072107    if (!defined $out) { 
    2108         return "Can't build error template; got error '" . $tmpl->errstr 
     2108        return "Can't build error template; got error '" . encode_html( $tmpl->errstr ) 
    21092109            . "'. Giving up. Original error was <pre>$param->{error}</pre>"; 
    21102110    } 
    …… 
    23162316 
    23172317    if (ref($body) && ($body->isa('MT::Template'))) { 
    2318         $body = $@ || $app->errstr; 
     2318        $body = $app->show_error( { error => $@ || $app->errstr } ); 
    23192319    } 
    23202320