Add null check for admin session user

magento · Mar 25, 2020 · 61f847e · 61f847e
1 parent 207a449
commit 61f847e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php
@@ -379,11 +379,16 @@ protected function getCategoriesTree($filter = null)
      * @param string $filter
      * @return string
      */
-    private function getCategoriesTreeCacheId(int $storeId, string $filter = '') : string
+    private function getCategoriesTreeCacheId(int $storeId, string $filter = ''): string
     {
+        if ($this->session->getUser() !== null) {
+            return self::CATEGORY_TREE_ID
+                . '_' . (string)$storeId
+                . '_' . $this->session->getUser()->getAclRole()
+                . '_' . $filter;
+        }
         return self::CATEGORY_TREE_ID
-            . '_' . (string) $storeId
-            . '_' . $this->session->getUser()->getAclRole()
+            . '_' . (string)$storeId
             . '_' . $filter;
     }