Merge branch 'master' of git://projects.ceondo.com/indefero

This commit is contained in:
Thomas Keller 2010-08-07 23:42:13 +02:00
commit f25dbd8872

View File

@ -99,6 +99,7 @@ class IDF_Template_MarkdownPrefilter extends Pluf_Text_HTML_Filter
'caption' => array(), 'caption' => array(),
'code' => array(), 'code' => array(),
'dd' => array(), 'dd' => array(),
'del' => array('cite', 'class', 'datetime', 'dir', 'id', 'title'),
'div' => array('align', 'class'), 'div' => array('align', 'class'),
'dl' => array(), 'dl' => array(),
'dt' => array(), 'dt' => array(),
@ -112,6 +113,7 @@ class IDF_Template_MarkdownPrefilter extends Pluf_Text_HTML_Filter
'hr' => array(), 'hr' => array(),
'i' => array(), 'i' => array(),
'img' => array('src', 'class', 'alt', 'height', 'width', 'style'), 'img' => array('src', 'class', 'alt', 'height', 'width', 'style'),
'ins' => array('cite', 'class', 'datetime', 'dir', 'id', 'title'),
'li' => array(), 'li' => array(),
'ol' => array(), 'ol' => array(),
'p' => array('align', 'class'), 'p' => array('align', 'class'),
@ -151,7 +153,9 @@ class IDF_Template_MarkdownPrefilter extends Pluf_Text_HTML_Filter
'blockquote', 'blockquote',
'pre', 'pre',
'iframe', 'iframe',
'h1', 'h2', 'h3', 'address' 'h1', 'h2', 'h3', 'address',
'del',
'ins',
); );
// attributes which should be checked for valid protocols // attributes which should be checked for valid protocols
public $protocol_attributes = array( public $protocol_attributes = array(
@ -174,5 +178,7 @@ class IDF_Template_MarkdownPrefilter extends Pluf_Text_HTML_Filter
'caption', 'caption',
'li', 'li',
'span', 'span',
'del',
'ins',
); );
} }