From e218aaaed210f39e7bcc841296c980d45213f5cb Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sat, 20 Jun 2020 20:38:42 +0300
Subject: [PATCH] internalAclManager fix

---
 application/Espo/Core/Container.php        | 7 ++-----
 application/Espo/Core/Portal/Container.php | 8 ++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/application/Espo/Core/Container.php b/application/Espo/Core/Container.php
index 6a6699ea1d..504155abc0 100644
--- a/application/Espo/Core/Container.php
+++ b/application/Espo/Core/Container.php
@@ -246,7 +246,7 @@ class Container
 
     protected function loadAclManager()
     {
-        $className = $this->getServiceClassName('acl', '\\Espo\\Core\\AclManager');
+        $className = $this->getServiceClassName('aclManager', '\\Espo\\Core\\AclManager');
         return new $className(
             $this->get('container')
         );
@@ -254,10 +254,7 @@ class Container
 
     protected function loadInternalAclManager()
     {
-        $className = $this->getServiceClassName('acl', '\\Espo\\Core\\AclManager');
-        return new $className(
-            $this->get('container')
-        );
+        return $this->loadAclManager();
     }
 
     protected function loadAcl()
diff --git a/application/Espo/Core/Portal/Container.php b/application/Espo/Core/Portal/Container.php
index 19e0f7e5cc..aa64592b09 100644
--- a/application/Espo/Core/Portal/Container.php
+++ b/application/Espo/Core/Portal/Container.php
@@ -70,6 +70,14 @@ class Container extends \Espo\Core\Container
         return $obj;
     }
 
+    protected function loadInternalAclManager()
+    {
+        $className = $this->getServiceMainClassName('aclManager', '\\Espo\\Core\\AclManager');
+        return new $className(
+            $this->get('container')
+        );
+    }
+
     protected function loadAcl()
     {
         $className = $this->getServicePortalClassName('acl', '\\Espo\\Core\\Portal\\Acl');