projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'xorg/maint' into xorg/1.0.2/master
[platal.git]
/
include
/
ufbuilder.inc.php
diff --git
a/include/ufbuilder.inc.php
b/include/ufbuilder.inc.php
index
40c5a74
..
a28a10a
100644
(file)
--- a/
include/ufbuilder.inc.php
+++ b/
include/ufbuilder.inc.php
@@
-268,7
+268,7
@@
abstract class UFB_Field
return false;
}
return false;
}
- if (!$this->
empty
) {
+ if (!$this->
isEmpty()
) {
$ufc = $this->buildUFC($ufb);
if ($ufc != null) {
$ufb->addCond($ufc);
$ufc = $this->buildUFC($ufb);
if ($ufc != null) {
$ufb->addCond($ufc);
@@
-1010,6
+1010,11
@@
class UFBF_Networking extends UFBF_Text
}
}
}
}
+ public function isEmpty()
+ {
+ return parent::isEmpty() || $this->nwtype == 0;
+ }
+
public function buildUFC(UserFilterBuilder &$ufb)
{
return new UFC_Networking($this->nwtype, $this->val);
public function buildUFC(UserFilterBuilder &$ufb)
{
return new UFC_Networking($this->nwtype, $this->val);