From 720a29880df134fbccb45561a4edefeaa65e441e Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Wed, 27 Jul 2011 16:54:09 +0000
Subject: [PATCH] [gh-176] Merging from testing into staging
git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@903 20a16fea-79d4-4915-8869-1ea9d5ebf173
---
sites/all/modules/unl/includes/common.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sites/all/modules/unl/includes/common.php b/sites/all/modules/unl/includes/common.php
index 67a66e58..9bcc6fbe 100644
--- a/sites/all/modules/unl/includes/common.php
+++ b/sites/all/modules/unl/includes/common.php
@@ -73,6 +73,10 @@ function unl_get_site_settings($uri) {
throw new Exception('No settings.php exists for site at ' . $uri);
}
+ if (is_readable(DRUPAL_ROOT . '/sites/all/settings.php')) {
+ require DRUPAL_ROOT . '/sites/all/settings.php';
+ }
+
require $settings_file;
unset($uri);
unset($settings_file);
--
GitLab