Commit 3113c449 authored by helmo's avatar helmo

Issue #2941029 by Jon Pugh: Merge remote-tracking branch...

Issue #2941029 by Jon Pugh: Merge remote-tracking branch 'origin/2941029-platform-wide-settings' into 7.x-3.x
parents b2f412cc 88406a6d
...@@ -162,6 +162,11 @@ if (isset($_SERVER['db_name'])) { ...@@ -162,6 +162,11 @@ if (isset($_SERVER['db_name'])) {
include_once('<?php print $this->platform->server->include_path ?>/global.inc'); include_once('<?php print $this->platform->server->include_path ?>/global.inc');
} }
# Additional platform wide configuration settings.
if (is_readable('<?php print $this->platform->publish_path ?>/sites/all/platform.settings.php')) {
include_once('<?php print $this->platform->publish_path ?>/sites/all/platform.settings.php');
}
# Additional site configuration settings. # Additional site configuration settings.
if (is_readable('<?php print $this->site_path ?>/local.settings.php')) { if (is_readable('<?php print $this->site_path ?>/local.settings.php')) {
include_once('<?php print $this->site_path ?>/local.settings.php'); include_once('<?php print $this->site_path ?>/local.settings.php');
......
...@@ -162,6 +162,11 @@ if (isset($_SERVER['db_name'])) { ...@@ -162,6 +162,11 @@ if (isset($_SERVER['db_name'])) {
include_once('<?php print $this->platform->server->include_path ?>/global.inc'); include_once('<?php print $this->platform->server->include_path ?>/global.inc');
} }
# Additional platform wide configuration settings.
if (is_readable('<?php print $this->platform->publish_path ?>/sites/all/platform.settings.php')) {
include_once('<?php print $this->platform->publish_path ?>/sites/all/platform.settings.php');
}
# Additional site configuration settings. # Additional site configuration settings.
if (is_readable('<?php print $this->site_path ?>/local.settings.php')) { if (is_readable('<?php print $this->site_path ?>/local.settings.php')) {
include_once('<?php print $this->site_path ?>/local.settings.php'); include_once('<?php print $this->site_path ?>/local.settings.php');
......
...@@ -189,6 +189,11 @@ if (isset($_SERVER['db_name'])) { ...@@ -189,6 +189,11 @@ if (isset($_SERVER['db_name'])) {
include('<?php print $this->platform->server->include_path ?>/global.inc'); include('<?php print $this->platform->server->include_path ?>/global.inc');
} }
# Additional platform wide configuration settings.
if (is_readable('<?php print $this->platform->publish_path ?>/sites/all/platform.settings.php')) {
include('<?php print $this->platform->publish_path ?>/sites/all/platform.settings.php');
}
# Additional site configuration settings. # Additional site configuration settings.
if (is_readable('<?php print $this->site_path ?>/local.settings.php')) { if (is_readable('<?php print $this->site_path ?>/local.settings.php')) {
include('<?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