getUrl replaces deprecated bestUrl (more to come)

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

diff --git a/lib/searchaction.php b/lib/searchaction.php
index fd5f0b3ff5890c4ebe7b89b07b5a76d9472afc7a..cf0e583a44a1fadc649bdb3405f0a280bf609581 100644 (file)
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -84,10 +84,6 @@ class SearchAction extends Action
         return null;
     }
 
-    function showNoticeForm() {
-        // remote post notice form
-    }
-
     function showContent() {
         $this->showTop();
         $this->showForm();
@@ -129,21 +125,22 @@ class SearchAction extends Action
         $message = _("* Make sure all words are spelled correctly.
 * Try different keywords.
 * Try more general keywords.
-* Try fewer keywords.
-");
+* Try fewer keywords.");
+            $message .= "\n";
+
         if (!common_config('site', 'private')) {
             $qe = urlencode($q);
+            $message .= "\n";
             // Don't change these long strings to HEREDOC; xgettext won't pick them up.
             // TRANS: Standard search suggestions shown when a search does not give any results.
-            $message .= sprintf(_("
-You can also try your search on other engines:
+            $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);
+* [Collecta](http://collecta.com/#q=%s)"), $qe, $qe, $qe, $qe, $qe);
+            $message .= "\n";
         }
         $this->elementStart('div', 'help instructions');
         $this->raw(common_markup_to_html($message));