From 5514e22641cfe6d2879a37110acf1c4ff6d15006 Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Wed, 15 Jun 2011 20:28:52 +0000
Subject: [PATCH] [gh-143] Merging from testing into staging
git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@749 20a16fea-79d4-4915-8869-1ea9d5ebf173
---
includes/bootstrap.inc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 2d68c817..7791a7e8 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -550,6 +550,12 @@ 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;
$conf = array();
+ // UNL change: include a "global" settings file that applies to all sites.
+ if (file_exists(DRUPAL_ROOT . '/sites/all/settings.php')) {
+ include_once DRUPAL_ROOT . '/sites/all/settings.php';
+ }
+ // End UNL change.
+
if (file_exists(DRUPAL_ROOT . '/' . conf_path() . '/settings.php')) {
include_once DRUPAL_ROOT . '/' . conf_path() . '/settings.php';
}
--
GitLab