diff options
| author | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
|---|---|---|
| committer | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
| commit | b5fad9feefd0f261807222d8a4c42ead6253a65c (patch) | |
| tree | 399cd4a1b79f61530924ea59670af0bdd6cee5be /include/html2bbcode.php | |
| parent | 89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff) | |
| parent | b29a968be8df52cd7c9b6d5bebb618534788337c (diff) | |
| download | volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2 volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip | |
Fix merge conflict
Diffstat (limited to 'include/html2bbcode.php')
| -rw-r--r-- | include/html2bbcode.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 6d6e6333b..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) { |