From 88c7b71db3335f41fe1a578b70619e39b9045e8d Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 23 Dec 2020 13:19:41 +0800 Subject: [PATCH] Uncommited changes synced --- Pman/Roo.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Pman/Roo.php b/Pman/Roo.php index 6363917..5780633 100644 --- a/Pman/Roo.php +++ b/Pman/Roo.php @@ -916,7 +916,6 @@ class Pman_Roo extends Pman if (method_exists($x, 'toRooArray')) { $this->jok($x->toRooArray($req)); } - $this->jok($x->toArray()); @@ -924,6 +923,7 @@ class Pman_Roo extends Pman function insert($x, $req, $with_perm_check = true) { + if (method_exists($x, 'setFromRoo')) { $res = $x->setFromRoo($req, $this); if (is_string($res)) { @@ -932,7 +932,7 @@ class Pman_Roo extends Pman } else { $x->setFrom($req); } - + if ( $with_perm_check && !$this->checkPerm($x,'A', $req)) { $this->jerr("PERMISSION DENIED (i)"); } @@ -986,7 +986,7 @@ class Pman_Roo extends Pman if ($ev) { $ev->audit($x); } - + // note setFrom might handle this before hand...!??! if (!empty($_FILES) && method_exists($x, 'onUpload')) { $x->onUpload($this, $_REQUEST); -- 2.39.2