Merge branch 'cherry-pick-c9d6d88b' into '1.2.1-fixes'

Merge branch '5816-blacklist-is-not-reset-correctly-for-userattribute' into '1.2.1-fixes'

See merge request fusiondirectory/fd!342

include/simpleplugin/class_dialogAttributes.inc

@@ -94,6 +94,13 @@ class SingleUserSelectDialog extends GenericDialog
 {
   protected $dialogClass = 'singleUserSelect';
 
+  function dialog_execute ()
+  {
+    session::set('filterBlacklist', $this->attribute->getFilterBlackList());
+    session::set('filterWhitelist', $this->attribute->getFilterWhiteList());
+    return parent::dialog_execute();
+  }
+
   function handle_finish ()
   {
     $result = $this->dialog->detectPostActions();
@@ -628,6 +635,16 @@ class DialogButtonAttribute extends ButtonAttribute
       $this->plugin->openDialog(new $this->dialogClass($this->plugin, $this));
     }
   }
+
+  function getFilterBlackList ()
+  {
+    return array();
+  }
+
+  function getFilterWhiteList ()
+  {
+    return array();
+  }
 }
 
 class UserAttribute extends DialogButtonAttribute