Merge branch 'master' of github.com:roundcube/roundcubemail

Thomas Bruederli

2012-09-23 0c144b98a417d50b9c073ae3931fdad47390f1f7

 program/include/rcube_output_html.php

@@ -527,7 +527,7 @@
    {
        $GLOBALS['__version']   = html::quote(RCMAIL_VERSION);
        $GLOBALS['__comm_path'] = html::quote($this->app->comm_path);
        $GLOBALS['__skin_path'] = Q($this->config->get('skin_path'));
        $GLOBALS['__skin_path'] = html::quote($this->config->get('skin_path'));

        return preg_replace_callback('/\$(__[a-z0-9_\-]+)/',
            array($this, 'globals_callback'), $input);