Merge branch 'platal-1.0.0'

[platal.git] / classes / address.php

diff --git a/classes/address.php b/classes/address.php
index aad9fd0..0eac92c 100644 (file)
--- a/classes/address.php
+++ b/classes/address.php
@@ -135,7 +135,7 @@ class Address
 
     public function hasFlag($flag)
     {
-        return $this->flags->hasFlag($flag);
+        return ($this->flags != null && $this->flags->hasFlag($flag));
     }
 
     public function format(array $format = array())
@@ -150,7 +150,6 @@ class Address
             return true;
         }
 
-        require_once 'geocoding.inc.php';
         if ($format['requireGeocoding'] || $this->changed == 1) {
             $gmapsGeocoder = new GMapsGeocoder();
             $gmapsGeocoder->getGeocodedAddress($this);
@@ -167,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;
@@ -257,7 +259,6 @@ class Address
 
         $this->format();
         if (!$this->isEmpty()) {
-            require_once 'geocoding.inc.php';
             foreach ($areas as $area) {
                 Geocoder::getAreaId($this, $area);
             }
@@ -265,15 +266,15 @@ class Address
             XDB::execute('INSERT INTO  profile_addresses (pid, jobid, type, id, flags, accuracy,
                                                           text, postalText, postalCode, localityId,
                                                           subAdministrativeAreaId, administrativeAreaId,
-                                                          countryId, latitude, longitude, updateTime, pub, comment,
+                                                          countryId, latitude, longitude, pub, comment,
                                                           north, south, east, west)
-                               VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?},
-                                        {?}, {?}, {?}, FROM_UNIXTIME({?}), {?}, {?}, {?}, {?}, {?}, {?})',
+                               VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?},
+                                        {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
                          $this->pid, $this->jobid, $this->type, $this->id, $this->flags, $this->accuracy,
                          $this->text, $this->postalText, $this->postalCode, $this->localityId,
                          $this->subAdministrativeAreaId, $this->administrativeAreaId,
                          $this->countryId, $this->latitude, $this->longitude,
-                         time(), $this->pub, $this->comment,
+                         $this->pub, $this->comment,
                          $this->north, $this->south, $this->east, $this->west);
 
             if ($this->type == self::LINK_PROFILE) {