Merge branch 'w27_MDL-40399_m26_msarrayshift' of https://github.com/skodak/moodle

This commit is contained in:
Dan Poltawski 2013-07-02 13:34:09 +08:00
commit b25cd1f3d5
2 changed files with 6 additions and 6 deletions

View file

@ -625,8 +625,8 @@ class mssql_native_moodle_database extends moodle_database {
return $sql;
}
// ok, we have verified sql statement with ? and correct number of params
$parts = explode('?', $sql);
$return = array_shift($parts);
$parts = array_reverse(explode('?', $sql));
$return = array_pop($parts);
foreach ($params as $param) {
if (is_bool($param)) {
$return .= (int)$param;
@ -651,7 +651,7 @@ class mssql_native_moodle_database extends moodle_database {
$return .= "N'$param'";
}
$return .= array_shift($parts);
$return .= array_pop($parts);
}
return $return;
}

View file

@ -709,8 +709,8 @@ class sqlsrv_native_moodle_database extends moodle_database {
return $sql;
}
// ok, we have verified sql statement with ? and correct number of params
$parts = explode('?', $sql);
$return = array_shift($parts);
$parts = array_reverse(explode('?', $sql));
$return = array_pop($parts);
foreach ($params as $param) {
if (is_bool($param)) {
$return .= (int)$param;
@ -730,7 +730,7 @@ class sqlsrv_native_moodle_database extends moodle_database {
$return .= "N'$param'";
}
$return .= array_shift($parts);
$return .= array_pop($parts);
}
return $return;
}