MDL-49293 db: Pass sql_concat_join to sql_concat

This commit is contained in:
Andrew Nicols
2015-03-06 11:56:46 +08:00
parent 29e2563a6d
commit 9b16c1af2c
2 changed files with 2 additions and 11 deletions
+1 -5
View File
@@ -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) {
+1 -6
View File
@@ -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) {