Commit 9ba8724f authored by catch's avatar catch

Issue #1118520 by sun, Dave Reid, mr.baileys: Added inclusion of a...

Issue #1118520 by sun, Dave Reid, mr.baileys: Added inclusion of a settings.local.php file in settings.php.
parent 0a359914
......@@ -668,8 +668,10 @@ function drupal_settings_initialize() {
global $databases, $cookie_domain, $conf, $installed_profile, $update_free_access, $db_url, $db_prefix, $drupal_hash_salt, $is_https, $base_secure_url, $base_insecure_url, $config_directory_name;
$conf = array();
if (file_exists(DRUPAL_ROOT . '/' . conf_path() . '/settings.php')) {
include_once DRUPAL_ROOT . '/' . conf_path() . '/settings.php';
// Make conf_path() available as local variable in settings.php.
$conf_path = conf_path();
if (file_exists(DRUPAL_ROOT . '/' . $conf_path . '/settings.php')) {
include_once DRUPAL_ROOT . '/' . $conf_path . '/settings.php';
}
$is_https = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on';
......
......@@ -528,3 +528,17 @@
* Remove the leading hash signs to disable.
*/
# $conf['allow_authorize_operations'] = FALSE;
/**
* Load local development override configuration, if available.
*
* Use settings.local.php to override variables on secondary (staging,
* development, etc) installations of this site. Typically used to disable
* caching, JavaScript/CSS compression, re-routing of outgoing e-mails, and
* other things that should not happen on development and testing sites.
*
* Keep this code block at the end of this file to take full effect.
*/
# if (file_exists(DRUPAL_ROOT . '/' . $conf_path . '/settings.local.php')) {
# include DRUPAL_ROOT . '/' . $conf_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