Changeset 2772 for branches/release-41/lib/MT/App.pm

Timestamp:

07/14/08 19:59:34 (17 months ago)

Author:

bchoate

Message:

Fixed presentation issue with certain runtime errors.

Files:

• branches/release-41/lib/MT/App.pm (modified) (3 diffs)

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

@@ -2091 +2091 @@
     }
     $tmpl = $app->load_tmpl('error.tmpl') or
-        return "Can't load error template; got error '" . $app->errstr .
+        return "Can't load error template; got error '" . encode_html( $app->errstr ) .
                "'. Giving up. Original error was <pre>$param->{error}</pre>";
     my $type = $app->param('__type') || '';
@@ -2106 +2106 @@
     my $out = $tmpl->output;
     if (!defined $out) {
-        return "Can't build error template; got error '" . $tmpl->errstr
+        return "Can't build error template; got error '" . encode_html( $tmpl->errstr )
             . "'. Giving up. Original error was <pre>$param->{error}</pre>";
     }
@@ -2316 +2316 @@
 
     if (ref($body) && ($body->isa('MT::Template'))) {
-        $body = $@ || $app->errstr;
+        $body = $app->show_error( { error => $@ || $app->errstr } );
     }