From a64bd039b940f9ff09e6682f2faf803096d22ed6 Mon Sep 17 00:00:00 2001
From: Tobias Schultze <webmaster@tubo-world.de>
Date: Thu, 9 Oct 2014 22:00:23 +0200
Subject: [PATCH] [TwigBundle] remove unused email placeholder from error page

---
 .../TwigBundle/Resources/views/Exception/error.atom.twig     | 2 +-
 .../TwigBundle/Resources/views/Exception/error.html.twig     | 5 ++---
 .../TwigBundle/Resources/views/Exception/error.rdf.twig      | 2 +-
 .../TwigBundle/Resources/views/Exception/error.txt.twig      | 5 ++---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig
index 9c1ab3e468507..074389ce919e8 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig
@@ -1 +1 @@
-{% include 'TwigBundle:Exception:error.xml.twig' with { 'exception': exception } %}
+{% include 'TwigBundle:Exception:error.xml.twig' %}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig
index 1e0b12d1d6b14..30b51e4760ab0 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig
@@ -9,9 +9,8 @@
         <h2>The server returned a "{{ status_code }} {{ status_text }}".</h2>
 
         <div>
-            Something is broken. Please e-mail us at [email] and let us know
-            what you were doing when this error occurred. We will fix it as soon
-            as possible. Sorry for any inconvenience caused.
+            Something is broken. Please let us know what you were doing when this error occurred.
+            We will fix it as soon as possible. Sorry for any inconvenience caused.
         </div>
     </body>
 </html>
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig
index 9c1ab3e468507..074389ce919e8 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig
@@ -1 +1 @@
-{% include 'TwigBundle:Exception:error.xml.twig' with { 'exception': exception } %}
+{% include 'TwigBundle:Exception:error.xml.twig' %}
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.txt.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.txt.twig
index b621b089c8ab8..bec5b1e302486 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.txt.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.txt.twig
@@ -3,6 +3,5 @@ Oops! An Error Occurred
 
 The server returned a "{{ status_code }} {{ status_text }}".
 
-Please e-mail us at [email] and let us know what you were doing when this
-error occurred. We will fix it as soon as possible. Sorry for any
-inconvenience caused.
+Something is broken. Please let us know what you were doing when this error occurred.
+We will fix it as soon as possible. Sorry for any inconvenience caused.