Home Explore Help
Register Sign In
VendorSoftware
/
symfony
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

[FrameworkBundle] removed the need for decorating with SafeDecorator

Fabien Potencier 14 years ago
parent
7e6bddedf9
commit
2b613f34d5
4 changed files with 4 additions and 4 deletions
Unified View Show Diff Stats
  1. 1 1
      src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php
  2. 1 1
      src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.php
  3. 1 1
      src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/layout.php
  4. 1 1
      src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.php

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/Controller/ExceptionController.php
View File 

@@ -49,7 +49,7 @@ class ExceptionController extends ContainerAware
 
         $response = $this->container->get('templating')->renderResponse(
 
         $response = $this->container->get('templating')->renderResponse(
 
             'FrameworkBundle:Exception:'.($this->container->get('kernel')->isDebug() ? 'exception.php' : 'error.php'),
 
             'FrameworkBundle:Exception:'.($this->container->get('kernel')->isDebug() ? 'exception.php' : 'error.php'),
 
             array(
 
             array(
 
-                'exception'      => new SafeDecorator($exception),
 
+                'exception'      => $exception,
 
                 'logger'         => $logger,
 
                 'logger'         => $logger,
 
                 'currentContent' => $currentContent,
 
                 'currentContent' => $currentContent,
 
                 'embedded'       => $embedded,
 
                 'embedded'       => $embedded,

File diff suppressed because it is too large
+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.php


+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/layout.php
View File 

@@ -2,7 +2,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
     <head>
 
     <head>
 
         <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $view->getCharset() ?>"/>
 
         <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $view->getCharset() ?>"/>
 
-        <title><?php echo htmlspecialchars($exception->getMessage(), ENT_QUOTES, $view->getCharset()) ?> (<?php echo $exception->getStatusCode() ?> <?php echo $exception->getStatusText() ?>)</title>
 
+        <title><?php echo $exception->getMessage() ?> (<?php echo $exception->getStatusCode() ?> <?php echo $exception->getStatusText() ?>)</title>
 
         <style type="text/css">
 
         <style type="text/css">
 
             html { background: #eee }
 
             html { background: #eee }
 
             body { font: 11px Verdana, Arial, sans-serif; color: #333 }
 
             body { font: 11px Verdana, Arial, sans-serif; color: #333 }

+ 1 - 1
src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/traces.php
View File 

@@ -2,7 +2,7 @@
 
     <?php if ($count > 0): ?>
 
     <?php if ($count > 0): ?>
 
         <h3>
 
         <h3>
 
             <span><?php echo $count - $position + 1 ?>/<?php echo $count + 1 ?></span>
 
             <span><?php echo $count - $position + 1 ?>/<?php echo $count + 1 ?></span>
 
-            <?php echo $view->get('code')->abbrClass($exception->getClass()) ?>: <?php echo str_replace("\n", '<br />', htmlspecialchars($exception->getMessage(), ENT_QUOTES, $view->getCharset())) ?>
 
+            <?php echo $view->get('code')->abbrClass($exception->getClass()) ?>: <?php echo str_replace("\n", '<br />', $exception->getMessage()) ?>
 
             <a href="#" onclick="toggle('traces_<?php echo $position ?>', 'traces'); return false;">&raquo;</a><br />
 
             <a href="#" onclick="toggle('traces_<?php echo $position ?>', 'traces'); return false;">&raquo;</a><br />
 
         </h3>
 
         </h3>
 
     <?php else: ?>
 
     <?php else: ?>