Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/geocode.php b/actions/geocode.php
index 123a839f563a3c101d049022b1f3190d5ce88c7c..dc547f2c36cf2199421fd13edc0c22039f265f32 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.'));
         }
@@ -69,7 +70,7 @@ class GeocodeAction extends Action
      * @return nothing
      *
      */
-    function handle($args)
+    function handle()
     {
         header('Content-Type: application/json; charset=utf-8');
         $location_object = array();