From 7e269760446674f04882072177f83782865f6029 Mon Sep 17 00:00:00 2001 From: Bob Vincent Date: Fri, 20 May 2011 16:50:08 -0400 Subject: [PATCH] Issue #1055862 by catch: Require sites.php. --- includes/bootstrap.inc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 984739ee25c3e7a870aff5226ec78ef8360f7c23..1a6237d2ae6a896c1b1a348d52417ef7d08cb848 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -306,8 +306,9 @@ function conf_path($require_settings = TRUE, $reset = FALSE) { for ($i = count($uri) - 1; $i > 0; $i--) { for ($j = count($server); $j > 0; $j--) { $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i)); - if (isset($sites[$dir]) && file_exists(DRUPAL_ROOT . '/' . $confdir . '/' . $sites[$dir])) { - $dir = $sites[$dir]; + if (isset($sites[$dir])) { + $conf = "$confdir[$sites][$dir]"; + return $conf; } if (file_exists(DRUPAL_ROOT . '/' . $confdir . '/' . $dir . '/settings.php') || (!$require_settings && file_exists(DRUPAL_ROOT . '/' . $confdir . '/' . $dir))) { $conf = "$confdir/$dir"; -- 1.7.4.1