Merge branch '11515_encrypted_flag' into 'master'

11515_encrypted_flag

See merge request !1

@@ -165,6 +165,13 @@ class FlagManager {
         if(!$flag['is_filtered']) return $needle;
 
         $acceptedValues = $flag['accepted_values'];
+        if(isset($flag['both_usable'])){
+            if($flag['both_usable']){
+                return count(array_filter($acceptedValues, function($value) use ($needle) {
+                    return $value['encrypted_value'] == $needle || $value['value'] == $needle;
+                })) ? $needle : $defaultValue;
+            }
+        }
         return count(array_filter($acceptedValues, function($value) use ($needle) {
             return $value['encrypted_value'] == $needle;
         })) ? $needle : $defaultValue;