From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 15 Jul 2018 02:58:22 +0000 (-0400)
Subject: BAO_Navigation: Respect domain_id param
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7a487c63ac83cb3e80db4e2910285d73b901dc03;p=civicrm-core.git

BAO_Navigation: Respect domain_id param
---

diff --git a/CRM/Core/BAO/Navigation.php b/CRM/Core/BAO/Navigation.php
index 968bd1bb6e..9b5f50a00c 100644
--- a/CRM/Core/BAO/Navigation.php
+++ b/CRM/Core/BAO/Navigation.php
@@ -70,6 +70,7 @@ class CRM_Core_BAO_Navigation extends CRM_Core_DAO_Navigation {
     if (empty($params['id'])) {
       $params['is_active'] = CRM_Utils_Array::value('is_active', $params, FALSE);
       $params['has_separator'] = CRM_Utils_Array::value('has_separator', $params, FALSE);
+      $params['domain_id'] = CRM_Utils_Array::value('domain_id', $params, CRM_Core_Config::domainID());
     }
 
     if (!isset($params['id']) ||
@@ -93,8 +94,6 @@ class CRM_Core_BAO_Navigation extends CRM_Core_DAO_Navigation {
 
     $navigation->copyValues($params);
 
-    $navigation->domain_id = CRM_Core_Config::domainID();
-
     $navigation->save();
     return $navigation;
   }