Refactoring PhpReader::read() to check for .php file first. Fixed err…

…or when there's a directory with the same name.
cakephp · Oct 16, 2011 · f0d10b4 · f0d10b4
1 parent e47b970
commit f0d10b4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/Cake/Configure/PhpReader.php b/lib/Cake/Configure/PhpReader.php
@@ -72,10 +72,10 @@ public function read($key) {
 		} else {
 			$file = $this->_path . $key;
 		}
-		if (!file_exists($file)) {
-			$file .= '.php';
-			if (!file_exists($file)) {
-				throw new ConfigureException(__d('cake_dev', 'Could not load configuration files: %s or %s', substr($file, 0, -4), $file));
+		$file .= '.php';
+		if (!is_file($file)) {
+			if (!is_file(substr($file, 0, -4))) {
+				throw new ConfigureException(__d('cake_dev', 'Could not load configuration files: %s or %s', $file, substr($file, 0, -4)));
 			}
 		}
 		include $file;