harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

undo pull request #287

Browse Source
This commit is contained in:
friendica 2014-01-28 16:32:47 -08:00
parent 22cbfdce1d
commit d79a2e3b55
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/text.php
View File

@ -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;