X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=RooTrait.php;h=9a929f1ec7a527cfc29d6683860cac046aa4266d;hp=3a298efae7ad3d44f70de53cdc1c4823974adf19;hb=586e4eb470252d837ba18b67e4c3c1702131fd1d;hpb=ec82a78ef757df1491219ea33151218bf1c30281

diff --git a/RooTrait.php b/RooTrait.php
index 3a298efa..9a929f1e 100644
--- a/RooTrait.php
+++ b/RooTrait.php
@@ -92,7 +92,7 @@ trait Pman_Core_RooTrait {
         if (!is_array($id) && empty($id)) {
             
             if (method_exists($x, 'toRooSingleArray')) {
-                $this->jok($x->toRooSingleArray($this->getAuthUser(), $req));
+                $this->jok($x->toRooSingleArray($this->authUser, $req));
             }
             
             if (method_exists($x, 'toRooArray')) {
@@ -132,7 +132,7 @@ trait Pman_Core_RooTrait {
         }
         // different symantics on all these calls??
         if (method_exists($x, 'toRooSingleArray')) {
-            $this->jok($x->toRooSingleArray($this->getAuthUser(), $req));
+            $this->jok($x->toRooSingleArray($this->authUser, $req));
         }
         if (method_exists($x, 'toRooArray')) {
             $this->jok($x->toRooArray($req));
@@ -171,7 +171,7 @@ trait Pman_Core_RooTrait {
     {
         if (method_exists($x, 'applyFilters')) {
            // DB_DataObject::debugLevel(1);
-            if (false === $x->applyFilters($q, $this->getAuthUser(), $this)) {
+            if (false === $x->applyFilters($q, $this->authUser, $this)) {
                 return; 
             } 
         }
@@ -257,7 +257,7 @@ trait Pman_Core_RooTrait {
                         $x->whereAdd("(on_id = $oid  OR 
                                 on_id IN ( SELECT distinct(id) FROM Documents WHERE original = $o ) 
                             )");
-                        continue;
+                        continue 2;
                                 
                     }
                     $x->on_id = $val;
@@ -281,7 +281,7 @@ trait Pman_Core_RooTrait {
                     }
                     
                     
-                    continue;
+                    continue 2;
             }
         }
         if (!empty($q_filtered)) {
@@ -310,7 +310,7 @@ trait Pman_Core_RooTrait {
             return;
         }
         
-        if (Pman::$permitError) {
+        if (self::$permitError) {
              
             return;
             
@@ -368,7 +368,7 @@ trait Pman_Core_RooTrait {
         if (!method_exists($obj, 'checkPerm')) {
             return true;
         }
-        if ($obj->checkPerm($lvl, $this->getAuthUser(), $req))  {
+        if ($obj->checkPerm($lvl, $this->authUser, $req))  {
             return true;
         }