Fix search box on Safari and make pages validate

1 files changed, 6 insertions, 3 deletions

diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 61e4975eb..2108ed7ee 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -54,6 +54,7 @@ class rcube_template extends rcube_html_page
 
         $this->app = rcmail::get_instance();
         $this->config = $this->app->config->all();
+        $this->browser = new rcube_browser();
         
         //$this->framed = $framed;
         $this->set_env('task', $task);
@@ -707,8 +708,6 @@ class rcube_template extends rcube_html_page
             return '';
         }
 
-        $browser   = new rcube_browser();
-
         // try to find out the button type
         if ($attrib['type']) {
             $attrib['type'] = strtolower($attrib['type']);
@@ -755,7 +754,7 @@ class rcube_template extends rcube_html_page
             $attrib['alt'] = Q(rcube_label($attrib['alt']));
         }
         // set title to alt attribute for IE browsers
-        if ($browser->ie && $attrib['title'] && !$attrib['alt']) {
+        if ($this->browser->ie && $attrib['title'] && !$attrib['alt']) {
             $attrib['alt'] = $attrib['title'];
             unset($attrib['title']);
         }
@@ -1018,6 +1017,10 @@ class rcube_template extends rcube_html_page
         if (empty($attrib['id'])) {
             $attrib['id'] = 'rcmqsearchbox';
         }
+        if ($attrib['type'] == 'search' && !$this->browser->khtml) {
+          unset($attrib['type'], $attrib['results']);
+        }
+        
         $input_q = new html_inputfield($attrib);
         $out = $input_q->show();