diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-05 16:52:02 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-05 16:52:02 -0400 |
| commit | 08a9553ccc0fd883a77fbf36be5941ba119deda1 (patch) | |
| tree | d9ec5063c463f135c51d34fa2963a69965a8aad2 /include/bbcode.php | |
| parent | 0a3fbdd128dd3b80868c93cb93901b501edf576c (diff) | |
| parent | dd6718c2cdf2cadaf7478b848eb892dcda1dc7e9 (diff) | |
| download | volse-hubzilla-08a9553ccc0fd883a77fbf36be5941ba119deda1.tar.gz volse-hubzilla-08a9553ccc0fd883a77fbf36be5941ba119deda1.tar.bz2 volse-hubzilla-08a9553ccc0fd883a77fbf36be5941ba119deda1.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'include/bbcode.php')
| -rw-r--r-- | include/bbcode.php | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index ed332146f..42741b392 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -66,19 +66,6 @@ function bb_unspacefy_and_trim($st) { } -function bb_emoji($mtch) { - $s = strtolower($mtch[1]); - if(strpos($s,'x')) { - $e = substr($s,strpos($s,'x')+1); - if(file_exists('images/emoji/' . $e . '.png')) { - return '<img width="24" height="24" src="' . z_root() . '/images/emoji/' . $e . '.png" alt="emoji" />'; - } - else { - return $mtch[0]; - } - } -} - function bb_extract_images($body) { $saved_image = array(); @@ -1014,7 +1001,6 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim', $Text); } - $Text = preg_replace_callback('/\[\&\;([#a-z0-9]+)\;\]/', 'bb_emoji', $Text); $Text = preg_replace('/\[\&\;([#a-z0-9]+)\;\]/', '&$1;', $Text); // fix any escaped ampersands that may have been converted into links |