From 2e8c2cb7bed1e60ef24a4d79ffdd361c8c727e9b Mon Sep 17 00:00:00 2001 From: thomasb Date: Fri, 19 Sep 2008 17:01:57 +0000 Subject: Fix search box on Safari and make pages validate git-svn-id: https://svn.roundcube.net/trunk@1850 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_template.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'roundcubemail/program/include/rcube_template.php') diff --git a/roundcubemail/program/include/rcube_template.php b/roundcubemail/program/include/rcube_template.php index 61e4975eb..2108ed7ee 100755 --- a/roundcubemail/program/include/rcube_template.php +++ b/roundcubemail/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(); -- cgit v1.2.3