X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=RooTrait.php;h=3f0f4d4f4a677c5d6f0f51d7c9bf31aba8a03f36;hp=ae418d4e88c4702a0350c5766634da4ee304f9b5;hb=refs%2Fheads%2Fwip_edward_T5851_download_old_offer_sheet;hpb=9859d6d7ae79d4b66afe57f0dc2d4d2e3a6aa059

diff --git a/RooTrait.php b/RooTrait.php
index ae418d4e..3f0f4d4f 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));
@@ -152,7 +152,7 @@ trait Pman_Core_RooTrait {
         $excludecolumns = !empty($cfg['exclude']) ? $cfg['exclude'] : array();
           
         $excludecolumns[] = 'passwd'; // we never expose passwords
-        DB_DataObject::debugLevel(1);
+        
         $ret = $do->autoJoin(array(
             'include' => $onlycolumns,
             'exclude' => $excludecolumns,
@@ -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; 
             } 
         }
@@ -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;
         }