Index: program/include/html.php
===================================================================
--- program/include/html.php (revision 491a6e2901938f49c1e14907f9da615286c81719)
+++ program/include/html.php (revision a3f149eb5729ef1ba6d1c05b29fead1058f4c888)
@@ -249,5 +249,5 @@
protected $tagname = 'input';
protected $type = 'text';
- protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange','onclick','disabled','readonly','spellcheck');
+ protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange','onclick','disabled','readonly','spellcheck','results');
public function __construct($attrib = array())
Index: program/include/rcube_browser.php
===================================================================
--- program/include/rcube_browser.php (revision 0ced2b9ac03e425750a76dea3ed59156b2709b4c)
+++ program/include/rcube_browser.php (revision a3f149eb5729ef1ba6d1c05b29fead1058f4c888)
@@ -44,5 +44,6 @@
$this->ie = stristr($HTTP_USER_AGENT, 'compatible; msie') && !$this->opera;
$this->mz = stristr($HTTP_USER_AGENT, 'mozilla/5');
- $this->safari = stristr($HTTP_USER_AGENT, 'safari');
+ $this->khtml = stristr($HTTP_USER_AGENT, 'khtml');
+ $this->safari = ($this->khtml || stristr($HTTP_USER_AGENT, 'safari'));
if ($this->ns) {
Index: program/include/rcube_template.php
===================================================================
--- program/include/rcube_template.php (revision 8e1d4af2e5aa7d1b43ba3cf64f66c9bc23bd14cf)
+++ program/include/rcube_template.php (revision a3f149eb5729ef1ba6d1c05b29fead1058f4c888)
@@ -55,4 +55,5 @@
$this->app = rcmail::get_instance();
$this->config = $this->app->config->all();
+ $this->browser = new rcube_browser();
//$this->framed = $framed;
@@ -708,6 +709,4 @@
}
- $browser = new rcube_browser();
-
// try to find out the button type
if ($attrib['type']) {
@@ -756,5 +755,5 @@
}
// 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']);
@@ -1019,4 +1018,8 @@
$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();
Index: skins/default/mail.css
===================================================================
--- skins/default/mail.css (revision 4b6dd1f1f3057b41384f00f1eae50128b5b414c9)
+++ skins/default/mail.css (revision a3f149eb5729ef1ba6d1c05b29fead1058f4c888)
@@ -756,5 +756,4 @@
{
position:relative;
- min-height: 300px;
padding-bottom: 10px;
background-color: #FFFFFF;
Index: skins/default/watermark.html
===================================================================
--- skins/default/watermark.html (revision 4e17e6c9dbac8991ee8b302cb2581241247dc8bc)
+++ skins/default/watermark.html (revision a3f149eb5729ef1ba6d1c05b29fead1058f4c888)
@@ -2,4 +2,5 @@
+