diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2013-10-25 16:50:25 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2013-10-25 16:50:25 +0200 |
| commit | 98b7b548a229600f7653cd67d9aae43675938143 (patch) | |
| tree | 15c141db332b9ae87ef3fbf573ea32d30dc1ea76 /program/lib/Roundcube/html.php | |
| parent | 4e4c2511bc00cfc0214acab63b097efe142187a7 (diff) | |
| parent | 9c41ba3c9ebbb14d01abe961c420f71f9463e61a (diff) | |
Merge branch 'dev-canned-responses'
Conflicts (resolved):
skins/classic/includes/settingstabs.html
skins/larry/includes/settingstabs.html
Diffstat (limited to 'program/lib/Roundcube/html.php')
| -rw-r--r-- | program/lib/Roundcube/html.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php index 4f87d2599..f6f744cb2 100644 --- a/program/lib/Roundcube/html.php +++ b/program/lib/Roundcube/html.php @@ -3,7 +3,7 @@ /* +-----------------------------------------------------------------------+ | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2011, The Roundcube Dev Team | + | Copyright (C) 2005-2013, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -32,8 +32,8 @@ class html public static $doctype = 'xhtml'; public static $lc_tags = true; - public static $common_attrib = array('id','class','style','title','align'); - public static $containers = array('iframe','div','span','p','h1','h2','h3','form','textarea','table','thead','tbody','tr','th','td','style','script'); + public static $common_attrib = array('id','class','style','title','align','unselectable'); + public static $containers = array('iframe','div','span','p','h1','h2','h3','ul','form','textarea','table','thead','tbody','tr','th','td','style','script'); /** |