Disable autocapitalization in login form on iPad/iPhone (#1488609)

Conflicts:

	program/include/html.php

3 files changed, 6 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1e7fd6768..33c11ecf1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Disable autocapitalization in login form on iPad/iPhone (#1488609)
 - Fix focus on the list when list row is clicked (#1488600)
 - Added separate From and To columns apart from smart From/To column (#1486891)
 - Fix fallback to Larry skin when configured skin isn't available (#1488591)
diff --git a/program/include/html.php b/program/include/html.php
index 0e89d778f..c15ef45cb 100644
--- a/program/include/html.php
+++ b/program/include/html.php
@@ -317,7 +317,8 @@ class html_inputfield extends html
 {
     protected $tagname = 'input';
     protected $type = 'text';
-    protected $allowed = array('type','name','value','size','tabindex',
+    protected $allowed = array(
+        'type','name','value','size','tabindex','autocapitalize',
         'autocomplete','checked','onchange','onclick','disabled','readonly',
         'spellcheck','results','maxlength','src','multiple','placeholder');
 
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 8efb5c9da..9344e107d 100644
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -1137,6 +1137,9 @@ class rcube_template extends rcube_html_page
         if (empty($url) && !preg_match('/_(task|action)=logout/', $_SERVER['QUERY_STRING']))
             $url = $_SERVER['QUERY_STRING'];
 
+        // Disable autocapitalization on iPad/iPhone (#1488609)
+        $attrib['autocapitalize'] = 'off';
+
         // set atocomplete attribute
         $user_attrib = $autocomplete > 0 ? array() : array('autocomplete' => 'off');
         $host_attrib = $autocomplete > 0 ? array() : array('autocomplete' => 'off');