From 7797abe10372f12ce19c127921d9df60caa75ca1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 28 Nov 2016 17:26:02 -0500
Subject: [PATCH] CRM-19693 - Don't show options for disabled components

---
 CRM/Core/OptionGroup.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CRM/Core/OptionGroup.php b/CRM/Core/OptionGroup.php
index 8fdecdfdb5..a490208509 100644
--- a/CRM/Core/OptionGroup.php
+++ b/CRM/Core/OptionGroup.php
@@ -144,6 +144,8 @@ WHERE  v.option_group_id = g.id
 
     if ($onlyActive) {
       $query .= " AND  v.is_active = 1 ";
+      $enabledComponents = '"' . implode('","', CRM_Core_Config::singleton()->enableComponents) . '"';
+      $query .= " AND  (v.component_id IS NULL OR v.component_id IN (SELECT id FROM civicrm_component WHERE name IN ($enabledComponents))) ";
     }
     if (in_array($name, self::$_domainIDGroups)) {
       $query .= " AND v.domain_id = " . CRM_Core_Config::domainID();
-- 
2.25.1