From 656cae3e66c3cb1a7219e920cfa3b774a607c361 Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Wed, 10 Jan 2018 10:45:25 +0000 Subject: [PATCH] =?UTF-8?q?(Retrofit=20from=20trunk)=20N=C2=B01157=20Porta?= =?UTF-8?q?l:=20Exception=20raised=20in=20BrowseBrick=20when=20one=20of=20?= =?UTF-8?q?the=20levels=20had=20no=20scope.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SVN:2.4[5223] --- .../portal/src/controllers/browsebrickcontroller.class.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php index 9c1bdf47e6..01cc6c3164 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php @@ -410,7 +410,7 @@ class BrowseBrickController extends BrickController $oScopeSearch = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $oSearch->GetClass(), UR_ACTION_READ); $oSearch = ($oScopeSearch !== null) ? $oSearch->Intersect($oScopeSearch) : null; // - Allowing all data if necessary - if ($oScopeSearch->IsAllDataAllowed()) + if ($oScopeSearch !== null && $oScopeSearch->IsAllDataAllowed()) { $oSearch->AllowAllData(); }