mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 08:26:37 +02:00
data MDL-24131 fixed numeric field names throwing db error. numeric field names are not good for DB->sql_like()
This commit is contained in:
parent
38015ff926
commit
fdeb3e1f3b
1 changed files with 8 additions and 3 deletions
|
@ -1646,13 +1646,18 @@ function data_get_post_actions() {
|
||||||
function data_fieldname_exists($name, $dataid, $fieldid=0) {
|
function data_fieldname_exists($name, $dataid, $fieldid=0) {
|
||||||
global $CFG, $DB;
|
global $CFG, $DB;
|
||||||
|
|
||||||
|
if(!is_numeric($name)) {
|
||||||
|
$like = $DB->sql_like('df.name', $name, false);
|
||||||
|
} else {
|
||||||
|
$like = "df.name = $name";
|
||||||
|
}
|
||||||
if ($fieldid) {
|
if ($fieldid) {
|
||||||
return $DB->record_exists_sql("SELECT * FROM {data_fields} df
|
return $DB->record_exists_sql("SELECT * FROM {data_fields} df
|
||||||
WHERE ".$DB->sql_like('df.name', '?', false)." AND df.dataid = ?
|
WHERE ".$like." AND df.dataid = ?
|
||||||
AND ((df.id < ?) OR (df.id > ?))", array($name, $dataid, $fieldid, $fieldid));
|
AND ((df.id < ?) OR (df.id > ?))", array($dataid, $fieldid, $fieldid));
|
||||||
} else {
|
} else {
|
||||||
return $DB->record_exists_sql("SELECT * FROM {data_fields} df
|
return $DB->record_exists_sql("SELECT * FROM {data_fields} df
|
||||||
WHERE ".$DB->sql_like('df.name', '?', false)." AND df.dataid = ?", array($name, $dataid));
|
WHERE ".$like." AND df.dataid = ?", array($dataid));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue