Merge remote-tracking branch 'upstream/nightly' into nightly

[quix0rs-gnu-social.git] / lib / searchaction.php

diff --git a/lib/searchaction.php b/lib/searchaction.php
index b994e20296b895078722ad028fe8b36defdf507b..5ede78d41425fa9daa32cbe34defced970ebce4a 100644 (file)
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -56,9 +56,9 @@ class SearchAction extends Action
         return true;
     }
 
-    function handle($args)
+    function handle()
     {
-        parent::handle($args);
+        parent::handle();
         $this->showPage();
     }
 
@@ -135,11 +135,11 @@ class SearchAction extends Action
             // TRANS: Standard search suggestions shown when a search does not give any results.
             $message .= sprintf(_("You can also try your search on other engines:
 
-* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%site.server%%%%)
-* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)
-* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)
-* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)
-* [Collecta](http://collecta.com/#q=%s)"), $qe, $qe, $qe, $qe, $qe);
+* [DuckDuckGo](https://duckduckgo.com/?q=site%%3A%%%%site.server%%%%+%s)
+* [Ixquick](https://ixquick.com/do/search?query=site%%3A%%%%site.server%%%%+%s)
+* [Searx](https://searx.laquadrature.net/?q=site%%3A%%%%site.server%%%%+%s)
+* [Yahoo!](https://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)
+"), $qe, $qe, $qe, $qe);
             $message .= "\n";
         }
         $this->elementStart('div', 'help instructions');