jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

This fixes the problem with mixed variables in queries

Browse source
This commit is contained in:
Michael 2018-06-21 19:48:25 +00:00
parent 4b0cf8d60f
commit c1059875bc
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/dba.php
View file

@ -171,7 +171,7 @@ class dba {
*/ */
public static function database_name() { public static function database_name() {
$ret = self::p("SELECT DATABASE() AS `db`"); $ret = self::p("SELECT DATABASE() AS `db`");
$data = self::inArray($ret); $data = self::inArray($ret);
return $data[0]['db']; return $data[0]['db'];
} }
@ -1296,6 +1296,33 @@ class dba {
$condition_string .= " AND "; $condition_string .= " AND ";
} }
if (is_array($value)) { if (is_array($value)) {
// Check if there are integer values in the parameters
$is_int = false;
$is_alpha = false;
foreach ($value as $single_value) {
if (is_int($single_value)) {
$is_int = true;
}
// Is any non numeric value present?
if (!is_numeric($single_value)) {
$is_alpha = true;
}
}
// Cast them all in an unique method
if ($is_int) {
$casted = [];
foreach ($value as $single_value) {
if ($is_int AND !$is_alpha) {
$casted[] = (int)$single_value;
} else {
$casted[] = (string)$single_value;
}
}
$value = $casted;
}
$new_values = array_merge($new_values, array_values($value)); $new_values = array_merge($new_values, array_values($value));
$placeholders = substr(str_repeat("?, ", count($value)), 0, -2); $placeholders = substr(str_repeat("?, ", count($value)), 0, -2);
$condition_string .= "`" . $field . "` IN (" . $placeholders . ")"; $condition_string .= "`" . $field . "` IN (" . $placeholders . ")";