Merge pull request #25 from raoulbhatia/fix-1488669

Aleksander Machniak

2012-09-04 e8615cf494302f80aa9e8a36a280aa5cb8e3742a

 program/include/rcube_template.php

@@ -77,7 +77,7 @@
        $this->set_env('x_frame_options', $this->app->config->get('x_frame_options', 'sameorigin'));

        // load the correct skin (in case user-defined)
        $skin = $this->app->config->get('skin', 'default');
        $skin = $this->app->config->get('skin');
        $this->set_skin($skin);
        $this->set_env('skin', $skin);

@@ -158,7 +158,7 @@
            $valid = true;
        }
        else {
            $skin_path = $this->config['skin_path'] ? $this->config['skin_path'] : 'skins/default';
            $skin_path = $this->config['skin_path'] ? $this->config['skin_path'] : 'skins/'.rcube_config::DEFAULT_SKIN;
            $valid = !$skin;
        }

@@ -1137,6 +1137,9 @@
        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');