summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-12-01 16:09:13 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-12-01 16:09:13 +0100
commit740a2423b27ccc6a607615fd1c8c4c39aaffba0f (patch)
tree96b6fbf6ea3c0301b889508ce446263d843116a6 /system/database
parent34d9cd72cab1de6f722f2611f31ac4ab3f420d8b (diff)
parent71b78096d95fc8f5ab46686168acd702abb90dc9 (diff)
Merge pull request #728 from Repox/develop
call_user_func_array() error with $this->db->call_function(). This fixes issue #725
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_driver.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index c2d57a833..9d92f2f87 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1064,7 +1064,14 @@ class CI_DB_driver {
{
$args = (func_num_args() > 1) ? array_splice(func_get_args(), 1) : null;
- return call_user_func_array($function, $args);
+ if (is_null($args))
+ {
+ return call_user_func($function);
+ }
+ else
+ {
+ return call_user_func_array($function, $args);
+ }
}
}