Commit cfc73233 authored by Jon Pugh's avatar Jon Pugh

Merge branch '3055463-more-includes' into 7.x-3.x

parents 7301bb9a 74e8486d
......@@ -166,6 +166,11 @@ if (isset($_SERVER['db_name'])) {
include_once('<?php print $this->platform->root ?>/sites/all/platform.settings.php');
}
# Additional platform wide configuration settings.
if (is_readable('<?php print $this->platform->root ?>/sites/all/settings.php')) {
include_once('<?php print $this->platform->root ?>/sites/all/settings.php');
}
# Additional site configuration settings.
if (is_readable('<?php print $this->site_path ?>/local.settings.php')) {
include_once('<?php print $this->site_path ?>/local.settings.php');
......
......@@ -174,6 +174,11 @@ if (isset($_SERVER['db_name'])) {
include_once('<?php print $this->platform->root ?>/sites/all/platform.settings.php');
}
# Additional platform wide configuration settings.
if (is_readable('<?php print $this->platform->root ?>/sites/all/settings.php')) {
include_once('<?php print $this->platform->root ?>/sites/all/settings.php');
}
# Additional site configuration settings.
if (is_readable('<?php print $this->site_path ?>/local.settings.php')) {
include_once('<?php print $this->site_path ?>/local.settings.php');
......
......@@ -196,6 +196,11 @@ if (isset($_SERVER['db_name'])) {
include('<?php print $this->platform->root ?>/sites/all/platform.settings.php');
}
# Additional platform wide configuration settings.
if (is_readable('<?php print $this->platform->root ?>/sites/all/settings.php')) {
include_once('<?php print $this->platform->root ?>/sites/all/settings.php');
}
# Additional site configuration settings.
if (is_readable('<?php print $this->site_path ?>/local.settings.php')) {
include('<?php print $this->site_path ?>/local.settings.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