diff options
author | Evan Prodromou <evan@status.net> | 2010-01-31 15:27:58 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-31 15:27:58 -0500 |
commit | 779204b194447397d0770d96e291d9491fd731b9 (patch) | |
tree | d0bfe36cc2b743fce8507e8cf6851467ccec8789 /actions/geocode.php | |
parent | bd5278302574ae3af87f09e0d8191c95ab93582a (diff) | |
parent | 81087e45c5b797028e90181459e4c673cd7be278 (diff) |
Merge branch 'testing' into 0.9.x
Conflicts:
actions/apioauthauthorize.php
Diffstat (limited to 'actions/geocode.php')
-rw-r--r-- | actions/geocode.php | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/actions/geocode.php b/actions/geocode.php index 9671d2c27..e883c6ce4 100644 --- a/actions/geocode.php +++ b/actions/geocode.php @@ -42,6 +42,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { */ class GeocodeAction extends Action { + var $lat = null; + var $lon = null; + var $location = null; + function prepare($args) { parent::prepare($args); @@ -52,12 +56,7 @@ class GeocodeAction extends Action } $this->lat = $this->trimmed('lat'); $this->lon = $this->trimmed('lon'); - $location = Location::fromLatLon($this->lat, $this->lon); - if ($location) { - $this->location = Location::fromId($location->location_id, $location->location_ns); - $this->lat = $this->location->lat; - $this->lon = $this->location->lon; - } + $this->location = Location::fromLatLon($this->lat, $this->lon); return true; } @@ -95,4 +94,3 @@ class GeocodeAction extends Action return true; } } -?> |