Commit 394f6d2d authored by Adrian Rossouw's avatar Adrian Rossouw

Switch the db_url definition to the array format. Also conditionally include a...

Switch the db_url definition to the array format. Also conditionally include a local.settings.php in the site dir. #715482
parent 8d8cee23
......@@ -15,7 +15,7 @@
'password' => "<?php print $this->creds['db_passwd']; ?>",
'host' => "<?php print $this->creds['db_host']; ?>",
);
$db_url = "<?php print strtr("%db_type://%db_user:%db_passwd@%db_host/%db_name", array(
$db_url['default'] = "<?php print strtr("%db_type://%db_user:%db_passwd@%db_host/%db_name", array(
'%db_type' => $this->creds['db_type'],
'%db_user' => $this->creds['db_user'],
'%db_passwd' => $this->creds['db_passwd'],
......@@ -81,6 +81,11 @@
}
}
# Additional site configuration settings.
if (file_exists('<?php print $this->site_path ?>/local.settings.inc')) {
include_once('<?php print $this->site_path ?>/local.settings.inc');
}
# Additional host wide configuration settings. Useful for safely specifying configuration settings.
if (file_exists('<?php print $this->platform->server->include_path ?>/global.inc')) {
include_once('<?php print $this->platform->server->include_path ?>/global.inc');
......
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