From ed033a2473917ce4eee009ca120d4cb44ec226aa Mon Sep 17 00:00:00 2001 From: dMetzger Date: Tue, 13 Mar 2012 10:42:49 +0000 Subject: [PATCH] // Changed the order of the 2 part of a condition that checked the root directory in order to avoid a warning when an open base dir restriction was in effect --- config/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.inc.php b/config/config.inc.php index 8a056b9f0..ad9bc4d7c 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -49,7 +49,7 @@ if (!headers_sent()) /* No settings file? goto installer... */ if (!file_exists(dirname(__FILE__).'/settings.inc.php')) { - $dir = ((is_dir($_SERVER['REQUEST_URI']) || substr($_SERVER['REQUEST_URI'], -1) == '/') ? $_SERVER['REQUEST_URI'] : dirname($_SERVER['REQUEST_URI']).'/'); + $dir = ((substr($_SERVER['REQUEST_URI'], -1) == '/' || is_dir($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : dirname($_SERVER['REQUEST_URI']).'/'); if (!file_exists(dirname(__FILE__).'/../install')) die('Error: "install" directory is missing'); header('Location: install/');