From: Anne Limoges <anne.limoges_git@polytechnique.org>
Date: Sun, 6 Jan 2013 18:05:41 +0000 (+0100)
Subject: Bugfix on paypal payments for users without adresses.
X-Git-Tag: xorg/1.1.7~16
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=51ed2221250645bfc2758e859b338a0fb6b509ca;p=platal.git

Bugfix on paypal payments for users without adresses.
---

diff --git a/modules/payment/money/paypal.inc.php b/modules/payment/money/paypal.inc.php
index 98d78c6..f1bb052 100644
--- a/modules/payment/money/paypal.inc.php
+++ b/modules/payment/money/paypal.inc.php
@@ -81,13 +81,17 @@ class PayPal
                              GROUP BY  pa.pid, pa.jobid, pa.groupid, pa.id, pa.type
                                 LIMIT  1",
                               $user->profile()->id());
-            $this->infos['client'] = array_map('replace_accent', array_merge($info_client, $res->fetchOneAssoc()));
-            list($this->infos['client']['address1'], $this->infos['client']['address2']) =
-                explode("\n", Geocoder::getFirstLines($this->infos['client']['text'],
+            if(is_array($res)) {
+                $this->infos['client'] = array_map('replace_accent', array_merge($info_client, $res->fetchOneAssoc()));
+                list($this->infos['client']['address1'], $this->infos['client']['address2']) =
+                    explode("\n", Geocoder::getFirstLines($this->infos['client']['text'],
                                                       $this->infos['client']['zip'], 2));
-            unset($this->infos['client']['text']);
+                unset($this->infos['client']['text']);
+            } else {
+                $this->infos['client'] = array_map('replace_accent', $info_client);
+            }
         } else {
-            $this->infos['client'] = replace_accent($info_client);
+            $this->infos['client'] = array_map('replace_accent', $info_client);
         }
 
         // We build the transaction's reference