return $rsl;
case "x-face":
- return '<img src="xface.php?face='.base64_encode($_text).'" alt="x-face" />';
+ return '<img src="xface.php?face='.urlencode(base64_encode($_text)).'" alt="x-face" />';
default:
if (function_exists('hook_formatDisplayHeader')
}
if ($format == 'html') {
- $res = preg_replace("@(</p>)\n?-- \n?(<p[^>]*>|<br[^>]*>)@", "\\1<br/>-- \\2", $res);
- $res = preg_replace("@<br[^>]*>\n?-- \n?(<p[^>]*>)@", "<br/>-- <br/>\\2", $res);
- $parts = preg_split("@(:?<p[^>]*>\n?-- \n?</p>|<br[^>]*>\n?-- \n?<br[^>]*>)@", $res);
+ $res = preg_replace("@(</p>)\n?-- ?\n?(<p[^>]*>|<br[^>]*>)@", "\\1<br/>-- \\2", $res);
+ $res = preg_replace("@<br[^>]*>\n?-- ?\n?(<p[^>]*>)@", "<br/>-- <br/>\\2", $res);
+ $res = preg_replace("@(<pre[^>]*>)\n?-- ?\n@", "<br/>-- <br/>\\1", $res);
+ $parts = preg_split("@(:?<p[^>]*>\n?-- ?\n?</p>|<br[^>]*>\n?-- ?\n?<br[^>]*>)@", $res);
} else {
while (preg_match("@(^|<pre>|\n)>@i", $res)) {
$res = preg_replace("@(^|<pre>|\n)((>[^\n]*\n)+)@ie",