From: Stéphane Jacob <sj@m4x.org>
Date: Tue, 27 Sep 2011 07:13:15 +0000 (+0200)
Subject: Allows less public phones for addresses.
X-Git-Tag: xorg/1.1.4~124
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=12160997cbae052d05f0ef4cb6fd5e9fe27eadb1;p=platal.git

Allows less public phones for addresses.

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

diff --git a/classes/phone.php b/classes/phone.php
index 4ccab6b..c709281 100644
--- a/classes/phone.php
+++ b/classes/phone.php
@@ -333,7 +333,7 @@ class Phone
             $success = (!$phone->error && ($phone->format() || $phone->isEmpty()) && $success);
             if (!$phone->isEmpty()) {
                 // Restrict phone visibility to $maxPublicity
-                if (!is_null($maxPublicity) && Visibility::isLessRestrictive($phone->pub, $maxPublicity)) {
+                if (!is_null($maxPublicity) && Visibility::isLessRestrictive($maxPublicity, $phone->pub)) {
                     $phone->pub = $maxPublicity;
                 }
                 $phones[] = call_user_func(array($phone, $function));
@@ -341,7 +341,7 @@ class Phone
         }
         if (count($phones) == 0 && $requiresEmptyPhone) {
             $phone = new Phone();
-            if (!is_null($maxPublicity) && Visibility::isLessRestrictive($phone->pub, $maxPublicity)) {
+            if (!is_null($maxPublicity) && Visibility::isLessRestrictive($maxPublicity, $phone->pub)) {
                 // Restrict phone visibility to $maxPublicity
                 $phone->pub = $maxPublicity;
             }