Merge branch '11515_encrypted_flag' into 'master'

update FlagManager

See merge request !3

@@ -191,7 +191,7 @@ class FlagManager {
             if(!empty($_COOKIE[$flag['encrypted_name']])) return $this->filterFlag($flag, $_COOKIE[$flag['encrypted_name']], $defaultValue);
             if(!empty($_COOKIE[$flag['encrypted_name']])) return $this->filterFlag($flag, $_COOKIE[$flag['encrypted_name']], $defaultValue);
         }
         }
         $flagName = $flag['is_encrypted'] ? $flag['encrypted_name'] : $flag['name'];
         $flagName = $flag['is_encrypted'] ? $flag['encrypted_name'] : $flag['name'];
-        return !empty($_GET[$flagName]) ? $this->filterFlag($flag, $_GET[$flagName], $defaultValue) : (!empty($_COOKIE[$flag['encrypted_name']]) ? $this->filterFlag($flag, $_COOKIE[$flag['encrypted_name']], $defaultValue) : $defaultValue);
+        return !empty($_GET[$flagName]) ? $this->filterFlag($flag, $_GET[$flagName], $defaultValue) : (!empty($_COOKIE[$flag['encrypted_name']]) ? $this->filterFlag($flag, $_COOKIE[$flag['encrypted_name']], $defaultValue) : array('value' => $defaultValue, 'cookie_value' => $defaultValue ));
     }
     }
     
     
     public function getFlag($flag, $encrypted){
     public function getFlag($flag, $encrypted){