summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorRick Ellis <rick.ellis@ellislab.com>2008-08-21 20:55:09 +0200
committerRick Ellis <rick.ellis@ellislab.com>2008-08-21 20:55:09 +0200
commit65f46063afcebbe92a8ad67d9092bb073f79b8ce (patch)
tree3c35016b09f9799f5627bcc5dc0e5b2b1dc679b8 /system/libraries
parent6ad532917aa69d86db70f0da4a3b196003926fe9 (diff)
Added a bit more error trapping in the load() function
Diffstat (limited to 'system/libraries')
-rw-r--r--system/libraries/Loader.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index e090cc09c..1d88841dd 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -79,6 +79,11 @@ class CI_Loader {
return FALSE;
}
+ if ( ! is_null($params) AND ! is_array($params))
+ {
+ $params = NULL;
+ }
+
if (is_array($library))
{
foreach ($library as $class)