Merge pull request #729 from Repox/2.1-stable

This fixes issue #725

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);
+			}
 		}
 	}