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 d934930608fa448a0d73ffbe554737c41d78f7f9..a0cd2fa159ff127e3b80e29377bc25af00da3235 100644 (file)
--- a/actions/geocode.php
+++ b/actions/geocode.php
@@ -47,11 +47,12 @@ class GeocodeAction extends Action
     var $lon = null;
     var $location = null;
 
-    function prepare($args)
+    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.'));
         }
@@ -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,8 +90,7 @@ class GeocodeAction extends Action
      *
      * @return boolean true
      */
-
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }