projects
/
Pman.Base
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0359c12
)
Uncommited changes synced
author
Alan Knowles
<alan@roojs.com>
Wed, 23 Dec 2020 05:19:41 +0000
(13:19 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 23 Dec 2020 05:19:41 +0000
(13:19 +0800)
Pman/Roo.php
patch
|
blob
|
history
diff --git
a/Pman/Roo.php
b/Pman/Roo.php
index
6363917
..
5780633
100644
(file)
--- 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));
}
if (method_exists($x, 'toRooArray')) {
$this->jok($x->toRooArray($req));
}
-
$this->jok($x->toArray());
$this->jok($x->toArray());
@@
-924,6
+923,7
@@
class Pman_Roo extends Pman
function insert($x, $req, $with_perm_check = true)
{
function insert($x, $req, $with_perm_check = true)
{
+
if (method_exists($x, 'setFromRoo')) {
$res = $x->setFromRoo($req, $this);
if (is_string($res)) {
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);
}
} else {
$x->setFrom($req);
}
-
+
if ( $with_perm_check && !$this->checkPerm($x,'A', $req)) {
$this->jerr("PERMISSION DENIED (i)");
}
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);
}
if ($ev) {
$ev->audit($x);
}
-
+
// note setFrom might handle this before hand...!??!
if (!empty($_FILES) && method_exists($x, 'onUpload')) {
$x->onUpload($this, $_REQUEST);
// note setFrom might handle this before hand...!??!
if (!empty($_FILES) && method_exists($x, 'onUpload')) {
$x->onUpload($this, $_REQUEST);