mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-16 19:44:09 +02:00
Code Issues Releases Wiki Activity

Fixes #732 - Custom Emoticon packs were being ignored.

Browse Source
This commit is contained in:
Cameron
2015-08-24 09:48:27 -07:00
parent f2adea1481
commit e09688788c
4 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
e107_handlers/e_parse_class.php
View File

@@ -3994,14 +3994,15 @@ class e_emotefilter {
{
$pref = e107::getPref();
if(!$pref['emotepack'])
if(empty($pref['emotepack']))
{
$pref['emotepack'] = "default";
save_prefs();
e107::getConfig('emote')->clearPrefCache('emote');
e107::getConfig('core')->set('emotepack','default')->save(false,true,false);
}
$this->emotes = e107::getConfig("emote")->getPref();
if(!vartrue($this->emotes))
{
return;
@@ -4056,12 +4057,14 @@ class e_emotefilter {
}
}
}
function filterEmotes($text)
{
$text = str_replace($this->search, $this->replace, $text);
return $text;
}
function filterEmotesRev($text)
{