summaryrefslogtreecommitdiffstats
path: root/sites
diff options
context:
space:
mode:
authorAlex Pott2016-11-26 22:52:45 (GMT)
committerAlex Pott2016-11-27 10:59:24 (GMT)
commit8af9db2338ae1e2febebe5cd5abae547d81d37a5 (patch)
tree9002c2baddc91abc399412f0c5f587d83e6d5c28 /sites
parent29658ab069f4622972403f039222c41139b47f79 (diff)
Issue #2680379 by hchonov, mkalkbrenner, cilefen: services.yml and settings.local.php are not included if settings.php is a symlink
(cherry picked from commit 44adac7ace28a2c9db0b5302df39d8089f39e518)
Diffstat (limited to 'sites')
-rw-r--r--sites/default/default.settings.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 0da98e8..30deff4 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -667,7 +667,7 @@ if ($settings['hash_salt']) {
/**
* Load services definition file.
*/
-$settings['container_yamls'][] = __DIR__ . '/services.yml';
+$settings['container_yamls'][] = $app_root . '/' . $site_path . '/services.yml';
/**
* Override the default service container class.
@@ -749,6 +749,7 @@ $settings['file_scan_ignore_directories'] = [
*
* 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';
+#
+# if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) {
+# include $app_root . '/' . $site_path . '/settings.local.php';
# }