badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
Shish 2020-01-27 22:22:07 +00:00
parent 95f4474b72
commit 9ac8246fa2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/database.php
View file

@ -271,7 +271,7 @@ class Database
} }
/** /**
* Execute an SQL query and return a single value. * Execute an SQL query and return a single value, or null.
*/ */
public function get_one(string $query, array $args=[], bool $scoreql = false) public function get_one(string $query, array $args=[], bool $scoreql = false)
{ {
@ -281,7 +281,7 @@ class Database
$_start = microtime(true); $_start = microtime(true);
$row = $this->execute($query, $args)->fetch(); $row = $this->execute($query, $args)->fetch();
$this->count_time("get_one", $_start, $query, $args); $this->count_time("get_one", $_start, $query, $args);
return $row[0]; return $row ? $row[0] : null;
} }
/** /**

2
ext/handle_pixel/main.php
View file

@ -70,7 +70,7 @@ class PixelFileHandler extends DataHandlerExtension
return false; return false;
} }
$info = getimagesize($tmpname); $info = getimagesize($tmpname);
if (is_null($info)) { if (!$info) {
return false; return false;
} }
if (in_array($info[2], $valid)) { if (in_array($info[2], $valid)) {