Merge branch 'w27_MDL-40399_m24_msarrayshift' of https://github.com/skodak/moodle into MOODLE_24_STABLE

This commit is contained in:
Dan Poltawski
2013-07-02 13:33:49 +08:00
2 changed files with 6 additions and 6 deletions
+3 -3
View File
@@ -616,8 +616,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;
@@ -642,7 +642,7 @@ class mssql_native_moodle_database extends moodle_database {
$return .= "N'$param'";
}
$return .= array_shift($parts);
$return .= array_pop($parts);
}
return $return;
}
+3 -3
View File
@@ -701,8 +701,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;
@@ -722,7 +722,7 @@ class sqlsrv_native_moodle_database extends moodle_database {
$return .= "N'$param'";
}
$return .= array_shift($parts);
$return .= array_pop($parts);
}
return $return;
}