Commit 3a2ef2db authored by James Huang's avatar James Huang
Browse files

issue #3262997 - add fix to all calls for getActiveDomain() in domain_menus.module

parent 5c2165bb

domain_menus.module

+14 −6
Original line number Diff line number Diff line
@@ -162,7 +162,10 @@ function domain_menus_form_node_form_alter(&$form, FormStateInterface $form_stat 
    $user_domains = DomainAccessManager::getAccessValues($user);

    $user_domains_all = DomainAccessManager::getAllValue($user);

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

    $active_domain_id = $active_domain->id();

    if (empty($active_domain)) {

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

    }

    $active_domain_id = ($active_domain) ? $active_domain->id() : NULL;

    $menus = \Drupal::entityTypeManager()->getStorage('menu')->loadMultiple();

    foreach ($menus as $menu) {

      $menu_id = $menu->id();
@@ -305,7 +308,10 @@ function domain_menus_menu_link_content_create_access(AccountInterface $account, 
      $user_domains_all = DomainAccessManager::getAllValue($user);

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

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

      $active_domain_id = $active_domain->id();

      if (empty($active_domain)) {

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

      }

      $active_domain_id = ($active_domain) ? $active_domain->id() : NULL;

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

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

        if (!empty($menu_and_user_domains) || !empty($user_domains_all)) {
@@ -339,7 +345,10 @@ function domain_menus_menu_link_content_access(EntityInterface $entity, $operati 
  $user_domains_all = DomainAccessManager::getAllValue($user);

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

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

  $active_domain_id = $active_domain->id();

  if (empty($active_domain)) {

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

  }

  $active_domain_id = ($active_domain) ? $active_domain->id() : NULL;

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

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

    if (!empty($menu_and_user_domains) || !empty($user_domains_all)) {
@@ -369,11 +378,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();

  $active_domain_id = ($active_domain) ? $active_domain->id() : NULL;

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

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

    if (!empty($menu_and_user_domains) || !empty($user_domains_all)) {