diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-04 22:15:28 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-04 22:15:28 -0500 |
| commit | b34dd1ca713128d958712366140c80e35019a489 (patch) | |
| tree | 22dafb537207f0351aad8cff7656595b1c4ce01a /include | |
| parent | efb60e603cb8a76f96f5f5ff491af7e1b46f1bf0 (diff) | |
| parent | d369fcc9945f7e9635f154089d455410fe88495a (diff) | |
| download | volse-hubzilla-b34dd1ca713128d958712366140c80e35019a489.tar.gz volse-hubzilla-b34dd1ca713128d958712366140c80e35019a489.tar.bz2 volse-hubzilla-b34dd1ca713128d958712366140c80e35019a489.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
fixes in diabook
unused replacement variable displays %1 in all html2bbcode 'code' blocks
revup
style.css fix
* master:
Diffstat (limited to 'include')
| -rwxr-xr-x | include/html2bbcode.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 51d629940..32a90d7d6 100755 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -212,7 +212,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(); |