From 218d9fd2d6a07bdcb558d26c98d5c366f9b22962 Mon Sep 17 00:00:00 2001
From: Michael Devery <michael@compucorp.co.uk>
Date: Thu, 17 May 2018 12:01:17 +0100
Subject: [PATCH] dev/core#122 Add check for DELETE flag before unsetting it

---
 CRM/Core/BAO/CustomOption.php | 2 +-
 CRM/Core/OptionValue.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/BAO/CustomOption.php b/CRM/Core/BAO/CustomOption.php
index 8ac209c95eb2..6f52aa034b85 100644
--- a/CRM/Core/BAO/CustomOption.php
+++ b/CRM/Core/BAO/CustomOption.php
@@ -151,7 +151,7 @@ static public function getOptionListSelector(&$params) {
       );
 
       // disable deletion of option values for locked option groups
-      if ($isGroupLocked) {
+      if (($action & CRM_Core_Action::DELETE) && $isGroupLocked) {
         $action -= CRM_Core_Action::DELETE;
       }
 
diff --git a/CRM/Core/OptionValue.php b/CRM/Core/OptionValue.php
index 726b147e405c..682e9a61cc6c 100644
--- a/CRM/Core/OptionValue.php
+++ b/CRM/Core/OptionValue.php
@@ -147,7 +147,7 @@ public static function getRows($groupParams, $links, $orderBy = 'weight', $skipE
       }
 
       // disallow deletion of option values for locked groups
-      if ($isGroupLocked) {
+      if (($action & CRM_Core_Action::DELETE) && $isGroupLocked) {
         $action -= CRM_Core_Action::DELETE;
       }