Merge commit 'refs/merge-requests/1730' of git://gitorious.org/statusnet/mainline into 0.8.x

1 files changed, 9 insertions, 3 deletions

diff --git a/lib/searchaction.php b/lib/searchaction.php
index 0d9f85a8f..130b28ff5 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -135,16 +135,21 @@ class SearchAction extends Action
     }
 
     function searchSuggestions($q) {
-        $qe = urlencode($q);
-        $message = sprintf(_(<<<E_O_T
+        $message = _(<<<E_O_T
 * Make sure all words are spelled correctly.
 * Try different keywords.
 * Try more general keywords.
 * Try fewer keywords.
 
+E_O_T
+);
+        if (!common_config('site', 'private')) {
+            $qe = urlencode($q);
+            $message .= sprintf(_(<<<E_O_T
+
 You can also try your search on other engines:
 
-* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=identi.ca)
+* [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)
@@ -152,6 +157,7 @@ You can also try your search on other engines:
 
 E_O_T
 ), $qe, $qe, $qe, $qe, $qe);
+        }
         $this->elementStart('dl', array('id' => 'help_search', 'class' => 'help'));
         $this->element('dt', null, _('Search help'));
         $this->elementStart('dd', 'instructions');