mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +02:00
Merge branch 'w27_MDL-40399_m26_msarrayshift' of https://github.com/skodak/moodle
This commit is contained in:
commit
b25cd1f3d5
2 changed files with 6 additions and 6 deletions
|
@ -625,8 +625,8 @@ class mssql_native_moodle_database extends moodle_database {
|
||||||
return $sql;
|
return $sql;
|
||||||
}
|
}
|
||||||
// ok, we have verified sql statement with ? and correct number of params
|
// ok, we have verified sql statement with ? and correct number of params
|
||||||
$parts = explode('?', $sql);
|
$parts = array_reverse(explode('?', $sql));
|
||||||
$return = array_shift($parts);
|
$return = array_pop($parts);
|
||||||
foreach ($params as $param) {
|
foreach ($params as $param) {
|
||||||
if (is_bool($param)) {
|
if (is_bool($param)) {
|
||||||
$return .= (int)$param;
|
$return .= (int)$param;
|
||||||
|
@ -651,7 +651,7 @@ class mssql_native_moodle_database extends moodle_database {
|
||||||
$return .= "N'$param'";
|
$return .= "N'$param'";
|
||||||
}
|
}
|
||||||
|
|
||||||
$return .= array_shift($parts);
|
$return .= array_pop($parts);
|
||||||
}
|
}
|
||||||
return $return;
|
return $return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -709,8 +709,8 @@ class sqlsrv_native_moodle_database extends moodle_database {
|
||||||
return $sql;
|
return $sql;
|
||||||
}
|
}
|
||||||
// ok, we have verified sql statement with ? and correct number of params
|
// ok, we have verified sql statement with ? and correct number of params
|
||||||
$parts = explode('?', $sql);
|
$parts = array_reverse(explode('?', $sql));
|
||||||
$return = array_shift($parts);
|
$return = array_pop($parts);
|
||||||
foreach ($params as $param) {
|
foreach ($params as $param) {
|
||||||
if (is_bool($param)) {
|
if (is_bool($param)) {
|
||||||
$return .= (int)$param;
|
$return .= (int)$param;
|
||||||
|
@ -730,7 +730,7 @@ class sqlsrv_native_moodle_database extends moodle_database {
|
||||||
$return .= "N'$param'";
|
$return .= "N'$param'";
|
||||||
}
|
}
|
||||||
|
|
||||||
$return .= array_shift($parts);
|
$return .= array_pop($parts);
|
||||||
}
|
}
|
||||||
return $return;
|
return $return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue