dev/core#122 Add check for DELETE flag before unsetting it

civicrm · May 17, 2018 · 218d9fd · 218d9fd
1 parent 1c02925
commit 218d9fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;
       }