mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Issue #1628 Should fix it.

Browse Source
This commit is contained in:
Cameron
2016-05-08 08:31:04 -07:00
parent f21ec261d7
commit 4160389303
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
e107_handlers/e_parse_class.php
View File

@@ -4650,7 +4650,7 @@ class e_emotefilter
$key = preg_replace("#!(\w{3,}?)$#si", ".\\1", $key); $key = preg_replace("#!(\w{3,}?)$#si", ".\\1", $key);
// Next two probably to sort out legacy issues - may not be required any more // Next two probably to sort out legacy issues - may not be required any more
$key = preg_replace("#_(\w{3})$#", ".\\1", $key); // $key = preg_replace("#_(\w{3})$#", ".\\1", $key);
$key = str_replace("!", "_", $key); $key = str_replace("!", "_", $key);
@@ -4666,10 +4666,20 @@ class e_emotefilter
foreach($tmp as $code) foreach($tmp as $code)
{ {
$img = "<img class='e-emoticon' src='".$fileloc."' alt=\"".$alt."\" />"; $img = "<img class='e-emoticon' src='".$fileloc."' alt=\"".$alt."\" />";
$this->regSearch[] = "#(^|[\s>])(".$this->buildRegex($code).")($|[\s<])#"; // $this->regSearch[] = "#(^|[\s>])(".$this->buildRegex($code).")($|[\s<])#";
$this->regReplace[] ="$1".$img."$3"; // $this->regReplace[] ="$1".$img."$3";
$this->search[] = $code;
$this->replace[] = $img; $this->search[] = "\n".$code;
$this->replace[] = "\n".$img;
$this->search[] = " ".$code;
$this->replace[] = " ".$img;
$this->search[] = ">".$code; // Fix for emote within html.
$this->replace[] = ">".$img;
// $this->search[] = $code."<"; // Fix for emote within html.
// $this->replace[] = $img."<";
} }
@@ -4724,9 +4734,8 @@ class e_emotefilter
function filterEmotes($text) function filterEmotes($text)
{ {
return preg_replace($this->regSearch,$this->regReplace,$text); // return preg_replace($this->regSearch,$this->regReplace,$text);
//$text = str_replace($this->search, $this->replace, $text); return str_replace($this->search, $this->replace, $text);
//return $text;
} }