Merge branch 'w27_MDL-40266_m26_arrayshift' of https://github.com/skodak/moodle

This commit is contained in:
Dan Poltawski 2013-07-02 09:55:20 +08:00
commit ad3ebb8f5f

View File

@ -853,8 +853,8 @@ class mysqli_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;
@ -868,7 +868,7 @@ class mysqli_native_moodle_database extends moodle_database {
$param = $this->mysqli->real_escape_string($param);
$return .= "'$param'";
}
$return .= array_shift($parts);
$return .= array_pop($parts);
}
return $return;
}