Replace is_file() with the faster file_exists()

(where it makes sense)

Also:
 - Implemented caching of configuration arrays for smileys, foreign characters and doctypes.
 - Implemented cascading-style loading of configuration files (except for library configs, DB and constants.php).

1 files changed, 5 insertions, 4 deletions

diff --git a/system/core/Router.php b/system/core/Router.php
index 4755b3712..bb0ce16bd 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -133,13 +133,14 @@ class CI_Router {
 		}
 
 		// Load the routes.php file.
-		if (is_file(APPPATH.'config/'.ENVIRONMENT.'/routes.php'))
+		if (file_exists(APPPATH.'config/routes.php'))
 		{
-			include(APPPATH.'config/'.ENVIRONMENT.'/routes.php');
+			include(APPPATH.'config/routes.php');
 		}
-		elseif (is_file(APPPATH.'config/routes.php'))
+
+		if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/routes.php'))
 		{
-			include(APPPATH.'config/routes.php');
+			include(APPPATH.'config/'.ENVIRONMENT.'/routes.php');
 		}
 
 		$this->routes = (empty($route) OR ! is_array($route)) ? array() : $route;