Fixed DB::read_picture and DB::get_picture returning false when they shoudln't

Author: Flo Faber

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.2.1
+
+### Fixes
+* Fixed DB::get_picture and DB::read_picture incorrectly returning false when file did not contain an image.
+
+
 ## v1.2.0
 
 ### Improvements

src/DB.php

@@ -226,8 +226,7 @@ public function get_picture(string $uri, bool $include_binary = true)
     do{
 
       $picture_data = $this->mphpd->cmd("readpicture", [$uri, $offset]);
-      if($picture_data === false){ return false; }
-      if(!isset($picture_data["size"])){ return [ "size" => 0, "type" => null, "binary" => null ]; }
+      if($picture_data === false){ return [ "size" => 0, "type" => null, "binary" => null ]; }
 
       $size = $picture_data["size"];
       $type = $picture_data["type"];
@@ -253,7 +252,10 @@ public function get_picture(string $uri, bool $include_binary = true)
    */
   public function read_picture(string $uri)
   {
-    return $this->get_picture($uri, true)["binary"] ?? false;
+    $gp = $this->get_picture($uri, true);
+    if($gp === false){ return false; }
+    if($gp["binary"] === null){ return ""; }
+    return $gp["binary"];
   }