From: Alan Knowles Date: Fri, 18 Dec 2020 07:57:39 +0000 (+0800) Subject: sync X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=c60d09d08bab90de62c39db1ab8f43fdf1d4bf18 sync --- diff --git a/DataObjects/Images.php b/DataObjects/Images.php index 01c966e9..1af82d6a 100644 --- a/DataObjects/Images.php +++ b/DataObjects/Images.php @@ -684,11 +684,12 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $roo->addEvent("ADD", $this, $this->toEventString()); $r = DB_DataObject::factory($this->tableName()); + $r->id = $this->id; $roo->loadMap($r); $r->limit(1); $r->find(true); - $roo->jok($r->toArray()); + $roo->jok($r->toRooArray($ar)); } @@ -703,8 +704,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject if (!$this->checkPerm($this->id ? 'A' : 'E', $roo->authUser)) { $roo->jerr("IMAGE UPLOAD PERMISSION DENIED"); } - - + if (!isset($_FILES['imageUpload'])) { return; // standard update... @@ -724,7 +724,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject $roo->loadMap($r); $r->limit(1); $r->find(true); - $roo->jok($r->toArray()); + $roo->jok($r->toRooArray($ar)); }