diff options
| author | habeascodice <habeascodice@federated.social> | 2014-11-01 03:04:11 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-11-01 03:04:11 -0700 |
| commit | 31376de0665091f2dba04755562ccd238d57a13c (patch) | |
| tree | ae59c8697b9fd20c33aeaf8acb3a698b63e9657b /include/html2bbcode.php | |
| parent | c854f8c238da2df08b52249142ad24ef66e422d1 (diff) | |
| parent | 50c16c394fe2d966c62d30930600212a4e33303e (diff) | |
| download | volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.tar.gz volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.tar.bz2 volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/html2bbcode.php')
| -rw-r--r-- | include/html2bbcode.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/html2bbcode.php b/include/html2bbcode.php index df430e6c7..9ffc85a82 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -16,7 +16,7 @@ function node2bbcode(&$doc, $oldnode, $attributes, $startbb, $endbb) function node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb) { - $savestart = str_replace('$', '%', $startbb); + $savestart = str_replace('$', '\x01', $startbb); $replace = false; $xpath = new DomXPath($doc); @@ -37,7 +37,7 @@ function node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb) foreach ($attributes as $attribute => $value) { - $startbb = str_replace('%'.++$i, '$1', $startbb); + $startbb = str_replace('\x01'.++$i, '$1', $startbb); if (strpos('*'.$startbb, '$1') > 0) { @@ -283,8 +283,9 @@ function html2bbcode($message) array('[b]', '[/b]', '[i]', '[/i]'), $message); // Handling Yahoo style of mails - $message = str_replace('[hr][b]From:[/b]', '[quote][b]From:[/b]', $message); + // $message = str_replace('[hr][b]From:[/b]', '[quote][b]From:[/b]', $message); + $message = htmlspecialchars($message,ENT_COMPAT,'UTF-8',false); return(trim($message)); } |