From 15b9758d68d315d2600af1741b36b44efe3b2cef Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Thu, 22 Sep 2011 09:42:46 +0200
Subject: [PATCH] Fixes profile edition errors due to null visibility.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 classes/address.php | 6 +++---
 classes/phone.php   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/classes/address.php b/classes/address.php
index 665d91d..871526a 100644
--- a/classes/address.php
+++ b/classes/address.php
@@ -878,7 +878,7 @@ class Address
     }
 
     static public function iterate(array $pids = array(), array $types = array(),
-                                   array $jobids = array(), Visibility $visibility)
+                                   array $jobids = array(), $visibility = null)
     {
         return new AddressIterator($pids, $types, $jobids, $visibility);
     }
@@ -895,7 +895,7 @@ class AddressIterator implements PlIterator
 {
     private $dbiter;
 
-    public function __construct(array $pids, array $types, array $jobids, Visibility $visibility)
+    public function __construct(array $pids, array $types, array $jobids, $visibility)
     {
         $where = array();
         if (count($pids) != 0) {
@@ -907,7 +907,7 @@ class AddressIterator implements PlIterator
         if (count($jobids) != 0) {
             $where[] = XDB::format('(pa.jobid IN {?})', $jobids);
         }
-        if ($visibility == null) {
+        if ($visibility == null || !($visibility instanceof Visibility)) {
             $visibility = Visibility::defaultForRead();
         }
         $where[] = 'pve.best_display_level+0 <= pa.pub+0';
diff --git a/classes/phone.php b/classes/phone.php
index 0cb0703..4ccab6b 100644
--- a/classes/phone.php
+++ b/classes/phone.php
@@ -374,7 +374,7 @@ class Phone
     }
 
     static public function iterate(array $pids = array(), array $link_types = array(),
-                                   array $link_ids = array(), Visibility $visibility)
+                                   array $link_ids = array(), $visibility = null)
     {
         return new PhoneIterator($pids, $link_types, $link_ids, $visibility);
     }
@@ -391,7 +391,7 @@ class PhoneIterator implements PlIterator
 {
     private $dbiter;
 
-    public function __construct(array $pids, array $link_types, array $link_ids, Visibility $visibility)
+    public function __construct(array $pids, array $link_types, array $link_ids, $visibility)
     {
         $where = array();
         if (count($pids) != 0) {
@@ -403,7 +403,7 @@ class PhoneIterator implements PlIterator
         if (count($link_ids) != 0) {
             $where[] = XDB::format('(link_id IN {?})', $link_ids);
         }
-        if ($visibility == null) {
+        if ($visibility == null || !($visibility instanceof Visibility)) {
             $visibility = Visibility::defaultForRead();
         }
         $where[] = 'pve.best_display_level+0 <= pub+0';
-- 
2.1.4