diff options
author | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-03-04 10:04:25 +0100 |
---|---|---|
committer | Daniel Hunsaker <danhunsaker@gmail.com> | 2013-03-04 10:04:25 +0100 |
commit | e5d7af508680afced4c96b5a52a054c73b6c537e (patch) | |
tree | 133b6f7791b975bfc6ecb017ba3a8d862cdecb6c /system/core | |
parent | 3b5b7f48848d098c6190781f8790a1b0dcb0217c (diff) | |
parent | 5780d8b2078126f8eb5738658fceadd38c66fe5b (diff) |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/exit-status
Diffstat (limited to 'system/core')
-rw-r--r-- | system/core/Loader.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index 6e5b58ba7..d4e63231c 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -459,7 +459,7 @@ class CI_Loader { */ public function vars($vars = array(), $val = '') { - if ($val !== '' && is_string($vars)) + if (is_string($vars)) { $vars = array($vars => $val); } |