diff --git a/VERSION b/VERSION index 6a617ef7..677fe642 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2013.02.05.08.45.51 +Version 2.4.1-alpha.2+timestamp.2013.02.05.08.49.14 diff --git a/gluon/html.py b/gluon/html.py index 35abdb82..63148cd8 100644 --- a/gluon/html.py +++ b/gluon/html.py @@ -553,7 +553,7 @@ class XML(XmlComponent): 'img/', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'table', 'tr', 'td', 'div', - 'strong', + 'strong','span', ], allowed_attributes={ 'a': ['href', 'title', 'target'], diff --git a/gluon/sanitizer.py b/gluon/sanitizer.py index 37433361..7a503e8c 100644 --- a/gluon/sanitizer.py +++ b/gluon/sanitizer.py @@ -212,6 +212,7 @@ def sanitize(text, permitted_tags=[ 'img/', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'table', 'tr', 'td', 'div', + 'strong', 'span', ], allowed_attributes={ 'a': ['href', 'title'],