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

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

diff --git a/actions/opensearch.php b/actions/opensearch.php
index 7bf32277bb4680618b94dcf76d0dc2df5ae95c09..c3a494be1be23d65012b0da05791a3d64c619fd5 100644 (file)
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -53,7 +53,7 @@ class OpensearchAction extends Action
      *
      * @return boolean false if user doesn't exist
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
         $type       = $this->trimmed('type');
@@ -63,8 +63,8 @@ class OpensearchAction extends Action
             // TRANS: ShortName in the OpenSearch interface when trying to find users.
             $short_name = _('People Search');
         } else {
-            // TRANS: ShortName in the OpenSearch interface when trying to find notices.
             $type       = 'noticesearch';
+            // TRANS: ShortName in the OpenSearch interface when trying to find notices.
             $short_name = _('Notice Search');
         }
         header('Content-Type: application/opensearchdescription+xml');
@@ -85,7 +85,7 @@ class OpensearchAction extends Action
         $this->endXML();
     }
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }