summaryrefslogtreecommitdiffstats
path: root/sites
diff options
context:
space:
mode:
authorwebchick2015-02-15 20:16:54 (GMT)
committerwebchick2015-02-15 20:16:54 (GMT)
commit5f5fa3b7af75ec9405cbe1c350ba272572515324 (patch)
tree3906d5191417ee66a4ab715c05ab16c47f61314e /sites
parent7ce6154007eb5ffa2a9cbc0fc8f41c1980c0c351 (diff)
Issue #2419225 by mikeker: settings.local.php trusted_host_patterns are ignored due to incorrect location of the include statement
Diffstat (limited to 'sites')
-rw-r--r--sites/default/default.settings.php28
1 files changed, 14 insertions, 14 deletions
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 8a3dfa4..ec5a709 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -600,20 +600,6 @@ if ($settings['hash_salt']) {
$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.
*
* Drupal core can use the Symfony trusted host mechanism to prevent HTTP Host
@@ -649,3 +635,17 @@ $settings['container_yamls'][] = __DIR__ . '/services.yml';
* 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';
+# }