summaryrefslogtreecommitdiffstats
path: root/system/codeigniter
diff options
context:
space:
mode:
authorRick Ellis <rick.ellis@ellislab.com>2006-11-20 18:29:05 +0100
committerRick Ellis <rick.ellis@ellislab.com>2006-11-20 18:29:05 +0100
commit325197e700564f8e4e0ba7c9fc82abfd85f451b0 (patch)
treec109f0c96f187dc3b919aca591daf5767de4c982 /system/codeigniter
parentebfa686046bb98c757d1b41c81eb867478036e68 (diff)
Diffstat (limited to 'system/codeigniter')
-rw-r--r--system/codeigniter/Common.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index 41e13bee6..4576cd964 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -106,14 +106,14 @@ function &get_config()
{
if ( ! file_exists(APPPATH.'config/config'.EXT))
{
- show_error('The configuration file config'.EXT.' does not exist.');
+ exit('The configuration file config'.EXT.' does not exist.');
}
require(APPPATH.'config/config'.EXT);
if ( ! isset($config) OR ! is_array($config))
{
- show_error('Your config file does not appear to be formatted correctly.');
+ exit('Your config file does not appear to be formatted correctly.');
}
$main_conf[0] =& $config;
@@ -210,8 +210,8 @@ function log_message($level = 'error', $message, $php_error = FALSE)
/**
* Exception Handler
*
-* This is the custom exception handler we defined at the
-* top of this file. The main reason we use this is permit
+* This is the custom exception handler that is declaired at the top
+* of Codeigniter.php. The main reason we use this is permit
* PHP errors to be logged in our own log files since we may
* not have access to server logs. Since this function
* effectively intercepts PHP errors, however, we also need