Ghislain Loas
--- a/library/Class/Feature.php
+++ b/library/Class/Feature.php
-                            '1',
-                            $this->getTimeSource()->time() + (3600 * 24 * 30 * 3));
-  }
-}
+    if(!$this->isPopupReady($user))
+      return;

+    return $this->setUserPopupKey($user);
+  }


-class Class_Feature_CookieJar {
-  public function setcookie() {
-    call_user_func_array('setcookie', func_get_args());
+  public function getUserPopupKey($user) {
+    return (new Class_User_Settings($user))->get(Class_User_Settings::POPUP_FEATURES);
--- a/library/Class/Feature.php
+++ b/library/Class/Feature.php
+    return $this->setUserPopupKey($user);
+  }


-class Class_Feature_CookieJar {
-  public function setcookie() {
-    call_user_func_array('setcookie', func_get_args());
+  public function getUserPopupKey($user) {
+    return (new Class_User_Settings($user))->get(Class_User_Settings::POPUP_FEATURES);
  }


-  public function getKey() {
-    return 'tracking_features_' . str_replace('.', '_', BOKEH_RELEASE_NUMBER);
+  public function setUserPopupKey($user) {
+    (new Class_User_Settings($user))->set(Class_User_Settings::POPUP_FEATURES, 1);