Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / actions / geocode.php

diff --git a/actions/geocode.php b/actions/geocode.php
index 9671d2c2769f4feb615688dadf37634e1c06d3d0..a0cd2fa159ff127e3b80e29377bc25af00da3235 100644 (file)
--- a/actions/geocode.php
+++ b/actions/geocode.php
@@ -37,27 +37,28 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @category Action
  * @package  StatusNet
  * @author   Craig Andrews <candrews@integralblue.com>
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
 class GeocodeAction extends Action
 {
-    function prepare($args)
+    var $lat = null;
+    var $lon = null;
+    var $location = null;
+
+    function prepare(array $args=array())
     {
         parent::prepare($args);
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->clientError(_('There was a problem with your session token. '.
                                  'Try again, please.'));
         }
         $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;
     }
 
@@ -68,8 +69,8 @@ class GeocodeAction extends Action
      *
      * @return nothing
      *
-     **/
-    function handle($args)
+     */
+    function handle(array $args=array())
     {
         header('Content-Type: application/json; charset=utf-8');
         $location_object = array();
@@ -89,10 +90,8 @@ class GeocodeAction extends Action
      *
      * @return boolean true
      */
-
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
 }
-?>