From 5f5fa3b7af75ec9405cbe1c350ba272572515324 Mon Sep 17 00:00:00 2001
From: webchick <drupal@webchick.net>
Date: Sun, 15 Feb 2015 12:16:54 -0800
Subject: [PATCH] Issue #2419225 by mikeker: settings.local.php
trusted_host_patterns are ignored due to incorrect location of the include
statement
---
sites/default/default.settings.php | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 8a3dfa494dda..ec5a709b70f9 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -599,20 +599,6 @@
*/
$settings['container_yamls'][] = __DIR__ . '/services.yml';
-/**
- * Load local development override configuration, if available.
- *
- * Use settings.local.php to override variables on secondary (staging,
- * development, etc) installations of this site. Typically used to disable
- * caching, JavaScript/CSS compression, re-routing of outgoing emails, and
- * other things that should not happen on development and testing sites.
- *
- * Keep this code block at the end of this file to take full effect.
- */
-# if (file_exists(__DIR__ . '/settings.local.php')) {
-# include __DIR__ . '/settings.local.php';
-# }
-
/**
* Trusted host configuration.
*
@@ -649,3 +635,17 @@
* will allow the site to run off of all variants of example.com and
* example.org, with all subdomains included.
*/
+
+/**
+ * Load local development override configuration, if available.
+ *
+ * Use settings.local.php to override variables on secondary (staging,
+ * development, etc) installations of this site. Typically used to disable
+ * caching, JavaScript/CSS compression, re-routing of outgoing emails, and
+ * other things that should not happen on development and testing sites.
+ *
+ * Keep this code block at the end of this file to take full effect.
+ */
+# if (file_exists(__DIR__ . '/settings.local.php')) {
+# include __DIR__ . '/settings.local.php';
+# }
--
GitLab