- 'email' => S::user()->bestEmail());
-
- // XXX: waiting for port of adresses.
- $res = XDB::query(
- "SELECT a.adr1 AS address1, a.adr2 AS address2,
- a.city, a.postcode AS zip, a.country,
- IF(t1.display_tel != '', t1.display_tel, t2.display_tel) AS night_phone_b
- FROM auth_user_quick AS q
- LEFT JOIN adresses AS a ON (q.user_id = a.uid AND FIND_IN_SET('active', a.statut))
- LEFT JOIN profile_phones AS t1 ON (t1.uid = a.uid AND t1.link_type = 'address' AND t1.link_id = a.adrid)
- LEFT JOIN profile_phones AS t2 ON (t2.uid = a.uid AND t2.link_type = 'user' AND t2.link_id = 0)
- WHERE q.user_id = {?}
- LIMIT 1", S::v('uid'));
+ 'email' => S::user()->bestEmail()
+ );
+
+ $res = XDB::query("SELECT pa.text, gl.name AS city, pa.postalCode AS zip, pa.countryiId AS country,
+ IF(pp1.display_tel != '', pp1.display_tel, pp2.display_tel) AS night_phone_b
+ FROM profile_addresses AS pa
+ LEFT JOIN profile_phones AS pp1 ON (pp1.pid = pa.pid AND pp1.link_type = 'address'
+ AND pp1.link_id = pa.adrid)
+ LEFT JOIN profile_phones AS pp2 ON (pp2.pid = pa.pid AND pp2.link_type = 'user'
+ AND pp2.link_id = 0)
+ LEFT JOIN geoloc_localities AS gl ON (gl.id = pa.localityId)
+ WHERE pa.pid = {?} AND FIND_IN_SET('current', pa.flags)
+ LIMIT 1",
+ S::i('pid'));