From: Dave Greenberg <dave@civicrm.org>
Date: Wed, 5 Aug 2015 22:56:36 +0000 (-0700)
Subject: CRM-16973 - filter FROM Email Address select by domain_id
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=84deca8b43e4b94522860a34486a9378bce48509;p=civicrm-core.git

CRM-16973 - filter FROM Email Address select by domain_id

----------------------------------------
* CRM-16973: CiviMail not respecting multisite ACL
  https://issues.civicrm.org/jira/browse/CRM-16973
---

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index 1905d16ed0..51fb5e6b37 100644
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -143,6 +143,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     ));
     $fromAddress = civicrm_api3('OptionValue', 'get', $params + array(
       'option_group_id' => "from_email_address",
+      'domain_id' => CRM_Core_Config::domainID(),
     ));
     CRM_Core_Resources::singleton()
       ->addSetting(array(