MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3240 from annando/bugfix-dba

Browse source 
Bugfix: When a query fails we mustn't use the result value.
This commit is contained in:
rabuzarus 2017-03-17 13:20:56 +01:00 committed by GitHub
parent 6fdc219143 58bf1c50af
commit 1dd839c2c2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/dba.php
View file

@ -234,7 +234,9 @@ class dba {
case 'pdo': case 'pdo':
$result = @$this->db->query($sql); $result = @$this->db->query($sql);
// Is used to separate between queries that returning data - or not // Is used to separate between queries that returning data - or not
if (!is_bool($result)) {
$columns = $result->columnCount(); $columns = $result->columnCount();
}
break; break;
case 'mysqli': case 'mysqli':
$result = @$this->db->query($sql); $result = @$this->db->query($sql);
@ -329,7 +331,7 @@ class dba {
} }
} }
if (($result === true) || ($result === false)) { if (is_bool($result)) {
return $result; return $result;
} }
if ($onlyquery) { if ($onlyquery) {