summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-12-01 16:10:09 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-12-01 16:10:09 +0100
commitcceb2063ae42eaee5a1ae7fd07e7054f6c239ae5 (patch)
treeaa29bf529caa122737928e33477ac8d56aafeec8 /system
parentb9ad907ca50c5067f8eec1ccf77544cf62466b17 (diff)
parentd92bd57f007e9561a37be8a8ccaf93a4f8948343 (diff)
Merge pull request #729 from Repox/2.1-stable
This fixes issue #725
Diffstat (limited to 'system')
-rw-r--r--system/database/DB_driver.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 3680b85c2..3952d7276 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1015,8 +1015,14 @@ class CI_DB_driver {
else
{
$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);
+ }
}
}