Merge branch '17459_pci' into 'master'

17459_pci

See merge request !5

@@ -156,8 +156,10 @@ class FlagManager {
         if(!$flags) return [];
         if(!$flags) return [];
         foreach($flags as $flag){
         foreach($flags as $flag){
             $value = $this->checkFlag($flag, !empty($flag['default']) ? $flag['default'] : null);
             $value = $this->checkFlag($flag, !empty($flag['default']) ? $flag['default'] : null);
-            setcookie($flag['name'], null, time() + (86400 * 30), "/");
-            setcookie($flag['encrypted_name'], $value['cookie_value'], time() + (86400 * 30), "/");
+            if(isset($_GET[$flag['name']])){
+                setcookie($flag['name'], null, time() + (86400 * 30), "/");
+                setcookie($flag['encrypted_name'], $value['cookie_value'], time() + (86400 * 30), "/");
+            }
         }
         }
     }
     }