10000 [TwigBundle] remove unused email placeholder from error page by Tobion · Pull Request #12193 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[TwigBundle] remove unused email placeholder from error page #12193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2014
Merged

[TwigBundle] remove unused email placeholder from error page #12193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{% include 'TwigBundle:Exception:error.xml.twig' with { 'exception': exception } %}
{% include 'TwigBundle:Exception:error.xml.twig' %}
5 changes: 2 additions & 3 deletions src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 soo CACC n
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>
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{% include 'TwigBundle:Exception:error.xml.twig' with { 'exception': exception } %}
{% include 'TwigBundle:Exception:error.xml.twig' %}
5 changes: 2 additions & 3 deletions src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.txt.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
0