From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Sun, 17 Feb 2013 23:34:30 +0000 (+0100)
Subject: Fix address lookup.
X-Git-Tag: xorg/1.1.7~8
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=b66ba81c34216c6761b9f2f5b660f5a83b440600;p=platal.git

Fix address lookup.

- Remove extra arg causing parameter shift
- Don't override passed in flags

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---

diff --git a/classes/userfilter/conditions.inc.php b/classes/userfilter/conditions.inc.php
index 0f1f95f..7ea27f4 100644
--- a/classes/userfilter/conditions.inc.php
+++ b/classes/userfilter/conditions.inc.php
@@ -1101,20 +1101,18 @@ class UFC_AddressComponent extends UFC_Address
     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);
         }
 
-        $flags = self::FLAG_ANY;
         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)