Merge branch 'master' into account

[platal.git] / include / userset.inc.php

diff --git a/include/userset.inc.php b/include/userset.inc.php
index 8c6040f..a7fe264 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -26,7 +26,7 @@ class UserSet extends PlSet
     public function __construct($cond = null)
     {
         $this->cond = new UFC_And();
-        if (!is_null($cond)) {
+        if (!is_null($cond) && ($cond instanceof UserFilterCondition)) {
             $this->cond->addChild($cond);
         }
     }