Commit 5c2165bb authored by git's avatar git Committed by James Huang
Browse files

Issue #3262997 by medusa43: DomainNegotiator::getActiveDomain() unset in domain_menus.module

parent 25cd49a4

domain_menus.module

+4 −0
Original line number Diff line number Diff line
@@ -369,6 +369,10 @@ function domain_menus_menu_access(EntityInterface $entity, $operation, AccountIn 
  $user_domains_all = DomainAccessManager::getAllValue($user);

  $menu_and_user_domains = array_intersect_key($menu_domains, $user_domains);

  $active_domain = \Drupal::service('domain.negotiator')->getActiveDomain();

  // @todo remove after https://www.drupal.org/project/domain/issues/3226427 is fixed?

  if(empty($active_domain)) {

    $active_domain = \Drupal::service('domain.negotiator')->getActiveDomain(TRUE);

  }

  $active_domain_id = $active_domain->id();

  // permission check order matters, do "edit assigned domain menus" first

  if ($account->hasPermission('edit assigned domain menus')) {