summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorEric Barnes <eric@ericlbarnes.com>2011-03-22 02:28:58 +0100
committerEric Barnes <eric@ericlbarnes.com>2011-03-22 02:28:58 +0100
commitfdd5b11b62f127901ddff2e5dc7923b063371070 (patch)
tree62b688d3635918089348a8cca9d4ce03d9ca3711 /system/core
parent74089b2e80614f65112d812470b0959909e37682 (diff)
Fixed logic and removed the error supressing
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Hooks.php6
-rw-r--r--system/core/Router.php8
2 files changed, 7 insertions, 7 deletions
diff --git a/system/core/Hooks.php b/system/core/Hooks.php
index b41c645ae..d1e5586de 100644
--- a/system/core/Hooks.php
+++ b/system/core/Hooks.php
@@ -65,13 +65,13 @@ class CI_Hooks {
// 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 bd363da71..2c78efe07 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -87,15 +87,15 @@ class CI_Router {
}
// 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);