Fixed logic and removed the error supressing
diff --git a/system/core/Hooks.php b/system/core/Hooks.php
index b41c645..d1e5586 100644
--- a/system/core/Hooks.php
+++ b/system/core/Hooks.php
@@ -65,13 +65,13 @@
// Grab the "hooks" definition file.
// If there are no hooks, we're done.
- if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/hooks'.EXT))
+ if (is_file(APPPATH.'config/'.ENVIRONMENT.'/hooks'.EXT))
{
include(APPPATH.'config/'.ENVIRONMENT.'/hooks'.EXT);
}
- else
+ elseif (is_file(APPPATH.'config/hooks'.EXT))
{
- @include(APPPATH.'config/hooks'.EXT);
+ include(APPPATH.'config/hooks'.EXT);
}
diff --git a/system/core/Router.php b/system/core/Router.php
index bd363da..2c78efe 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -87,15 +87,15 @@
}
// Load the routes.php file.
-
- if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/routes'.EXT))
+ if (is_file(APPPATH.'config/'.ENVIRONMENT.'/routes'.EXT))
{
include(APPPATH.'config/'.ENVIRONMENT.'/routes'.EXT);
}
- else
+ elseif (is_file(APPPATH.'config/routes'.EXT))
{
- @include(APPPATH.'config/routes'.EXT);
+ include(APPPATH.'config/routes'.EXT);
}
+
$this->routes = ( ! isset($route) OR ! is_array($route)) ? array() : $route;
unset($route);