Fixes small issue in name.func.inc.php.

[platal.git] / modules / profile / addresses.inc.php

diff --git a/modules/profile/addresses.inc.php b/modules/profile/addresses.inc.php
index 6574761..49b7f95 100644 (file)
--- a/modules/profile/addresses.inc.php
+++ b/modules/profile/addresses.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-class ProfileAddress extends ProfileGeoloc
+class ProfileAddress extends ProfileGeocoding
 {
     private $bool;
     private $pub;
@@ -75,7 +75,7 @@ class ProfileAddress extends ProfileGeoloc
             if (!trim($address['text'])) {
                 unset($value[$key]);
             } elseif (!$init) {
-                $this->geolocAddress($address, $s);
+                $this->geocodeAddress($address, $s);
                 $success = $success && $s;
             }
             $this->cleanAddress($page, $key, $address);
@@ -93,7 +93,7 @@ class ProfileAddress extends ProfileGeoloc
                      format_phone_number($tel['tel']), $tel['tel'], $tel['pub']);
     }
 
-    private function saveAddress($addrid, array &$address)
+    public function saveAddress($addrid, array &$address, $type)
     {
         require_once "geocoding.inc.php";
 
@@ -123,10 +123,10 @@ class ProfileAddress extends ProfileGeoloc
                                                       subAdministrativeAreaId, administrativeAreaId,
                                                       countryId, latitude, longitude, updateTime, pub, comment,
                                                       north, south, east, west)
-                           VALUES  ({?}, 'home', {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?},
+                           VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?},
                                     {?}, {?}, FROM_UNIXTIME({?}), {?}, {?}, {?}, {?}, {?}, {?})",
-                     S::i('uid'), $addrid, $flags, $address['accuracy'],
-                     $address['text'], 'postalText'/*$address['postalText']*/, $address['postalCode'], $address['localityId'],
+                     S::i('uid'), $type, $addrid, $flags, $address['accuracy'],
+                     $address['text'], $address['postalText'], $address['postalCode'], $address['localityId'],
                      $address['subAdministrativeAreaId'], $address['administrativeAreaId'],
                      $address['countryId'], $address['latitude'], $address['longitude'],
                      $address['updateTime'], $address['pub'], $address['comment'],
@@ -142,7 +142,7 @@ class ProfileAddress extends ProfileGeoloc
                             WHERE  uid = {?} AND link_type = 'address'",
                      S::i('uid'));
         foreach ($value as $addrid => &$address) {
-            $this->saveAddress($addrid, $address);
+            $this->saveAddress($addrid, $address, 'home');
             $profiletel = new ProfilePhones('address', $addrid);
             $profiletel->saveTels('tel', $address['tel']);
         }
@@ -162,7 +162,7 @@ class ProfileAddresses extends ProfilePage
 
     protected function _fetchData()
     {
-        $res = XDB::query("SELECT  type, id, accuracy, text, postalText,
+        $res = XDB::query("SELECT  id, accuracy, text, postalText,
                                    postalCode, localityId, subAdministrativeAreaId, administrativeAreaId,
                                    countryId, latitude, longitude, pub, comment, updateTime,
                                    north, south, east, west,