From: Stéphane Jacob <sj@m4x.org>
Date: Thu, 19 May 2011 17:32:28 +0000 (+0200)
Subject: Fixes addresses related DirEnum.
X-Git-Tag: xorg/1.1.2~62^2~7
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=6ccfd8f28a469616ec72365bec742d8a0c7f41e7;p=platal.git

Fixes addresses related DirEnum.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

diff --git a/classes/direnum.php b/classes/direnum.php
index 0cad8f2..0b51cb6 100644
--- a/classes/direnum.php
+++ b/classes/direnum.php
@@ -602,38 +602,43 @@ class DE_AddressesComponents extends DirEnumeration
 
     protected $ac_join   = 'INNER JOIN profile_addresses_components ON (profile_addresses_components.component_id = profile_addresses_components_enum.id)';
     protected $ac_unique = 'profile_addresses_components.pid';
-    protected $ac_where  = 'profile_addresses_components.type = \'home\'';
 }
 // }}}
 // {{{ class DE_AddressesComponents extensions
 class DE_Countries extends DE_AddressesComponents
 {
     protected $where = 'WHERE  FIND_IN_SET(\'country\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'country\', profile_addresses_components_enum.types)';
 }
 
 class DE_Admnistrativeareas1 extends DE_AddressesComponents
 {
     protected $where = 'WHERE  FIND_IN_SET(\'admnistrative_area_1\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'admnistrative_area_1\', profile_addresses_components_enum.types)';
 }
 
 class DE_Admnistrativeareas2 extends DE_AddressesComponents
 {
     protected $where = 'WHERE  FIND_IN_SET(\'admnistrative_area_2\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'admnistrative_area_2\', profile_addresses_components_enum.types)';
 }
 
 class DE_Admnistrativeareas3 extends DE_AddressesComponents
 {
     protected $where = 'WHERE  FIND_IN_SET(\'admnistrative_area_3\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'admnistrative_area_3\', profile_addresses_components_enum.types)';
 }
 
 class DE_Localities extends DE_AddressesComponents
 {
     protected $where = 'WHERE  FIND_IN_SET(\'locality\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'locality\', profile_addresses_components_enum.types)';
 }
 
 class DE_Sublocalities extends DE_AddressesComponents
 {
     protected $where = 'WHERE  FIND_IN_SET(\'sublocality\', profile_addresses_components_enum.types)';
+    protected $ac_where  = 'profile_addresses_components.type = \'home\' AND FIND_IN_SET(\'sublocality\', profile_addresses_components_enum.types)';
 }
 
 // }}}