From 9b16c1af2c646b181abd1f538bf9e1ac09316e8a Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Wed, 25 Feb 2015 12:25:34 +0800 Subject: [PATCH] MDL-49293 db: Pass sql_concat_join to sql_concat --- lib/dml/mssql_native_moodle_database.php | 6 +----- lib/dml/sqlsrv_native_moodle_database.php | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/lib/dml/mssql_native_moodle_database.php b/lib/dml/mssql_native_moodle_database.php index 44ddc603aca..c6a6b9c184e 100644 --- a/lib/dml/mssql_native_moodle_database.php +++ b/lib/dml/mssql_native_moodle_database.php @@ -1207,11 +1207,7 @@ class mssql_native_moodle_database extends moodle_database { for ($n=count($elements)-1; $n > 0 ; $n--) { array_splice($elements, $n, 0, $separator); } - $s = implode(' + ', $elements); - if ($s === '') { - return " '' "; - } - return " $s "; + return call_user_func_array(array($this, 'sql_concat'), $elements); } public function sql_isempty($tablename, $fieldname, $nullablefield, $textfield) { diff --git a/lib/dml/sqlsrv_native_moodle_database.php b/lib/dml/sqlsrv_native_moodle_database.php index f7613988f30..36d78936d0e 100644 --- a/lib/dml/sqlsrv_native_moodle_database.php +++ b/lib/dml/sqlsrv_native_moodle_database.php @@ -1272,12 +1272,7 @@ class sqlsrv_native_moodle_database extends moodle_database { for ($n = count($elements) - 1; $n > 0; $n--) { array_splice($elements, $n, 0, $separator); } - $s = implode(' + ', $elements); - - if ($s === '') { - return " '' "; - } - return " $s "; + return call_user_func_array(array($this, 'sql_concat'), $elements); } public function sql_isempty($tablename, $fieldname, $nullablefield, $textfield) {