Revert "Revert "run 'set names' after each connection to deal with UTF8 correctly""

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

diff --git a/lib/searchaction.php b/lib/searchaction.php
index 697262ccdb27cab5250b7e9d04859e767da78bf0..e74450e11f3e06dee57ce04754d81c7ac02a6bd6 100644 (file)
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -51,7 +51,7 @@ class SearchAction extends Action
      *
      * @return boolean true
      */
-    function isReadOnly()
+    function isReadOnly($args)
     {
         return true;
     }
@@ -146,14 +146,17 @@ You can also try your search on other engines:
 
 * [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=identi.ca)
 * [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)
-* [Google](http://www.google.com/search?q=site%%3Aidenti.ca+%s)
-* [Yahoo](http://search.yahoo.com/search?p=site%%3Aidenti.ca+%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)
 
 
 E_O_T
 ), $qe, $qe, $qe, $qe);
-        $this->elementStart('div', 'blankfiller');
+        $this->elementStart('dl', array('id' => 'help_search', 'class' => 'help'));
+        $this->element('dt', null, _('Search help'));
+        $this->elementStart('dd', 'instructions');
         $this->raw(common_markup_to_html($message));
+        $this->elementEnd('dd');
         $this->elementEnd('div');
     }
 }