Commit fd9904a8 authored by helmo's avatar helmo

Issue #2940702: Merge remote-tracking branch 'origin/2940702-settings-includes' into 7.x-3.x

parents 75bd3d9a e79524c8
......@@ -186,10 +186,10 @@ if (isset($_SERVER['db_name'])) {
# Additional host wide configuration settings. Useful for safely specifying configuration settings.
if (is_readable('<?php print $this->platform->server->include_path ?>/global.inc')) {
include_once('<?php print $this->platform->server->include_path ?>/global.inc');
include('<?php print $this->platform->server->include_path ?>/global.inc');
}
# 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');
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