Merge commit 'upstream/master'

This commit is contained in:
Michael Vogel 2012-03-09 11:41:23 +01:00
commit 11c29e0cba
255 changed files with 20796 additions and 3539 deletions

View file

@ -216,7 +216,7 @@ function html2bbcode($message)
node2bbcode($doc, 'audio', array('src'=>'/(.+)/'), '[audio]$1', '[/audio]');
node2bbcode($doc, 'iframe', array('src'=>'/(.+)/'), '[iframe]$1', '[/iframe]');
node2bbcode($doc, 'code', array(), '[code]$1', '[/code]');
node2bbcode($doc, 'code', array(), '[code]', '[/code]');
$message = $doc->saveHTML();