Merge branch 'release/3.0.41' into master-v3.0

craftcms · Feb 22, 2019 · cbea330 · cbea330
2 parents 606639f + 8e730f8
commit cbea330
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/templates/400.html b/src/templates/400.html
@@ -3,5 +3,5 @@
 
 {% block message %}
     <h2>{{ title }}</h2>
-    <p>{{ message ?: "The request could not be understood by the server due to malformed syntax."|t('app') }}</p>
+    <p>{{ (message ?? null) ?: "The request could not be understood by the server due to malformed syntax."|t('app') }}</p>
 {% endblock %}
diff --git a/src/templates/403.html b/src/templates/403.html
@@ -3,5 +3,5 @@
 
 {% block message %}
     <h2>{{ title }}</h2>
-    <p>{{ message ?: "You don’t have the proper credentials to access this page."|t('app') }}</p>
+    <p>{{ (message ?? null) ?: "You don’t have the proper credentials to access this page."|t('app') }}</p>
 {% endblock %}
diff --git a/src/templates/404.html b/src/templates/404.html
@@ -3,5 +3,5 @@
 
 {% block message %}
     <h2>{{ title }}</h2>
-    <p>{{ message ?: "The requested URL was not found on this server."|t('app') }}</p>
+    <p>{{ (message ?? null) ?: "The requested URL was not found on this server."|t('app') }}</p>
 {% endblock %}
diff --git a/src/templates/500.html b/src/templates/500.html
@@ -3,5 +3,5 @@
 
 {% block message %}
     <h2>{{ title }}</h2>
-    <p>{{ message ?: "An error occurred while processing your request."|t('app') }}</p>
+    <p>{{ (message ?? null) ?: "An error occurred while processing your request."|t('app') }}</p>
 {% endblock %}
diff --git a/src/templates/503.html b/src/templates/503.html
@@ -3,5 +3,5 @@
 
 {% block message %}
     <h2>{{ title }}</h2>
-    <p>{{ message ?: "Our site is temporarily unavailable. Please try again later."|t('app') }}</p>
+    <p>{{ (message ?? null) ?: "Our site is temporarily unavailable. Please try again later."|t('app') }}</p>
 {% endblock %}