aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-28 16:32:47 -0800
committerfriendica <info@friendica.com>2014-01-28 16:32:47 -0800
commitd79a2e3b55c7cf6c775b8ecf7fbf708248aa16c8 (patch)
tree598ef6439521a01183dbbd5dcb8d290e47c90968
parent22cbfdce1d8fe10296c5808759a02c96d3fbe48d (diff)
downloadvolse-hubzilla-d79a2e3b55c7cf6c775b8ecf7fbf708248aa16c8.tar.gz
volse-hubzilla-d79a2e3b55c7cf6c775b8ecf7fbf708248aa16c8.tar.bz2
volse-hubzilla-d79a2e3b55c7cf6c775b8ecf7fbf708248aa16c8.zip
undo pull request #287
-rwxr-xr-xinclude/text.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php
index 4cb7a1d5e..a459296cb 100755
--- a/include/text.php
+++ b/include/text.php
@@ -891,7 +891,7 @@ function smilies($s, $sample = false) {
$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_encode',$s);
$s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_encode',$s);
- $s = preg_replace_callback('/<(.*?)>/s','smile_encode',$s);
+// $s = preg_replace_callback('/<(.*?)>/ism','smile_encode',$s);
$texts = array(
'&lt;3',
@@ -984,7 +984,7 @@ function smilies($s, $sample = false) {
$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_decode',$s);
$s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_decode',$s);
- $s = preg_replace_callback('/<(.*?)>/s','smile_decode',$s);
+// $s = preg_replace_callback('/<(.*?)>/s','smile_decode',$s);
return $s;