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

Merge pull request #299 from toclimb/smilies-fix

Browse Source 
More efficient smilie replacing (see pull request #291)
This commit is contained in:
friendica 2014-02-02 11:49:52 -08:00
commit b7c4f033b5
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/text.php
View File

@ -889,8 +889,8 @@ function smilies($s, $sample = false) {
|| (local_user() && intval(get_pconfig(local_user(),'system','no_smilies')))) || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
return $s; return $s;
$s = preg_replace_callback('{<(pre|code)>(?<target>.*?)</\1>}ism','smile_encode',$s); $s = preg_replace_callback('{<(pre|code)>.*?</\1>}ism','smile_shield',$s);
$s = preg_replace_callback('/<[a-z]+ (?<target>.*?)>/ism','smile_encode',$s); $s = preg_replace_callback('/<[a-z]+ .*?>/ism','smile_shield',$s);
$texts = array( $texts = array(
'&lt;3', '&lt;3',
@ -981,20 +981,18 @@ function smilies($s, $sample = false) {
$s = str_replace($params['texts'],$params['icons'],$params['string']); $s = str_replace($params['texts'],$params['icons'],$params['string']);
} }
$s = preg_replace_callback( $s = preg_replace_callback('/<!--base64:(.*?)-->/ism', 'smile_unshield', $s);
'/<!--base64:(.*?)-->/ism',
function ($m) { return base64url_decode($m[1]); },
$s
);
return $s; return $s;
} }
function smile_shield($m) {
return '<!--base64:' . base64url_encode($m[0]) . '-->';
}
function smile_encode($m) { function smile_unshield($m) {
$cleartext = $m['target']; return base64url_decode($m[1]);
return str_replace($cleartext,'<!--base64:' . base64url_encode($cleartext) . '-->',$m[0]);
} }
// expand <3333 to the correct number of hearts // expand <3333 to the correct number of hearts