summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorEric Roberts <eric@cryode.com>2012-07-14 01:30:21 +0200
committerEric Roberts <eric@cryode.com>2012-07-14 01:30:21 +0200
commitfbdad67cac99868509bc1a27affdfc3e4b2a1dee (patch)
tree52c1e86324ee1a8bb36e119711707bdf09419a87 /system/core
parentfa337081ced1b1d34805d28f8307f069edf16cdf (diff)
parentdecc642f8c81dcf57e2e3217a44d5b1385163456 (diff)
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Common.php2
-rw-r--r--system/core/Loader.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index 7e93ed46d..06b162264 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -172,7 +172,7 @@ if ( ! function_exists('load_class'))
if ($name === FALSE)
{
// Note: We use exit() rather then show_error() in order to avoid a
- // self-referencing loop with the Excptions class
+ // self-referencing loop with the Exceptions class
set_status_header(503);
exit('Unable to locate the specified class: '.$class.'.php');
}
diff --git a/system/core/Loader.php b/system/core/Loader.php
index d51ee0b34..bfcef1cbc 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -237,9 +237,9 @@ class CI_Loader {
{
if (is_array($model))
{
- foreach ($model as $babe)
+ foreach ($model as $class)
{
- $this->model($babe);
+ $this->model($class);
}
return;
}