From f2ac8f49be2c89380e8fdc28b0b1a02794271433 Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Thu, 30 Sep 2010 19:05:21 +0200
Subject: [PATCH] Address countryId field should be null if no country was
 found.
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 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/classes/address.php b/classes/address.php
index 36eac5b..0eac92c 100644
--- a/classes/address.php
+++ b/classes/address.php
@@ -166,6 +166,9 @@ class Address
                 $mailer->send();
             }
         }
+        if ($this->countryId == '') {
+            $this->countryId = null;
+        }
         $this->geocodeChosen = null;
         $this->phones = Phone::formatFormArray($this->phones, $this->error);
         return !$this->error;
-- 
2.1.4