Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/opensearch.php b/actions/opensearch.php
index 7bf32277bb4680618b94dcf76d0dc2df5ae95c09..b7ed3212c2caa25aa24fb333ee04a5b253d94a7d 100644 (file)
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -53,9 +53,9 @@ class OpensearchAction extends Action
      *
      * @return boolean false if user doesn't exist
      */
-    function handle($args)
+    function handle()
     {
-        parent::handle($args);
+        parent::handle();
         $type       = $this->trimmed('type');
         $short_name = '';
         if ($type == 'people') {
@@ -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');