From: Stéphane Jacob <sj@m4x.org>
Date: Sat, 10 Dec 2011 23:40:55 +0000 (+0100)
Subject: Fixes issues on every address.
X-Git-Tag: xorg/1.1.5~57
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=001ef7efc781fb97019478b49200aced4bfcf8c8;p=platal.git

Fixes issues on every address.

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

diff --git a/upgrade/1.0.1/merge_issues.php b/upgrade/1.0.1/merge_issues.php
index 4c3fc88..1c06efc 100755
--- a/upgrade/1.0.1/merge_issues.php
+++ b/upgrade/1.0.1/merge_issues.php
@@ -118,7 +118,7 @@ $rawAddresses = array();
 $duplicates = array();
 foreach ($pids as $pid) {
     $count = 0;
-    $it = Address::iterate(array($pid), array(Address::LINK_PROFILE), array(0));
+    $it = Address::iterate(array($pid), array(Address::LINK_PROFILE), array(0), Visibility::get(Visibility::VIEW_PRIVATE));
     while ($item = $it->next()) {
         $addresses[$count] = $item;
         $rawAddress = preg_replace('/[^a-z0-9]/', ' ', mb_strtolower(replace_accent($item->text)));
@@ -212,7 +212,7 @@ $phones = array();
 $duplicates = array();
 foreach ($pids as $pid) {
     $count = 0;
-    $it = Phone::iterate(array($pid), array(Phone::LINK_PROFILE), array(0));
+    $it = Phone::iterate(array($pid), array(Phone::LINK_PROFILE), array(0), Visibility::get(Visibility::VIEW_PRIVATE));
     while ($item = $it->next()) {
         $phones[] = $item;
         ++$count;