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'
[platal.git]
/
classes
/
userfilter
/
conditions.inc.php
diff --git
a/classes/userfilter/conditions.inc.php
b/classes/userfilter/conditions.inc.php
index
0d639ee
..
2ad8d1d
100644
(file)
--- a/
classes/userfilter/conditions.inc.php
+++ b/
classes/userfilter/conditions.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
1
Polytechnique.org *
+ * Copyright (C) 2003-201
4
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-1101,20
+1101,18
@@
class UFC_AddressComponent extends UFC_Address
private $fieldtype;
private $exact;
private $fieldtype;
private $exact;
- public function __construct($val, $fieldtype, $
exact = true, $
type = null, $flags = self::FLAG_ANY)
+ public function __construct($val, $fieldtype, $type = null, $flags = self::FLAG_ANY)
{
if (!in_array($fieldtype, self::$components)) {
Platal::page()->killError('Invalid address field type: ' . $this->fieldtype);
}
{
if (!in_array($fieldtype, self::$components)) {
Platal::page()->killError('Invalid address field type: ' . $this->fieldtype);
}
- $flags = 0x20;
parent::__construct($type, $flags);
if (!is_array($val)) {
$val = array($val);
}
$this->val = $val;
$this->fieldtype = $fieldtype;
parent::__construct($type, $flags);
if (!is_array($val)) {
$val = array($val);
}
$this->val = $val;
$this->fieldtype = $fieldtype;
- $this->exact = $exact;
}
public function buildCondition(PlFilter $uf)
}
public function buildCondition(PlFilter $uf)
@@
-1723,5
+1721,5
@@
class UFC_PartnerSharingID extends UserFilterCondition
}
// }}}
}
// }}}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker
f
enc=utf-8:
?>
?>