Merge pull request #728 from Repox/develop

call_user_func_array() error with $this->db->call_function().
This fixes issue #725

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