Commit 44adac7a authored by alexpott's avatar alexpott

Issue #2680379 by hchonov, mkalkbrenner, cilefen: services.yml and...

Issue #2680379 by hchonov, mkalkbrenner, cilefen: services.yml and settings.local.php are not included if settings.php is a symlink
parent 46ff3bb2
...@@ -672,7 +672,7 @@ ...@@ -672,7 +672,7 @@
/** /**
* Load services definition file. * 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. * Override the default service container class.
...@@ -754,6 +754,7 @@ ...@@ -754,6 +754,7 @@
* *
* Keep this code block at the end of this file to take full effect. * 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';
# } # }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment