mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 01:54:12 +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

18
e107_handlers/pref_class.php
View File

@@ -807,9 +807,19 @@ final class e_core_pref extends e_pref
*/
function __construct($alias, $load = true)
{
$pref_alias = $alias;
if($alias == 'emote')
{
$pack = e107::pref('core','emotepack');
$this->aliases['emote'] = 'emote_'.$pack;
}
$pref_id = $this->getConfigId($alias);
if(!$pref_id)
{
$pref_id = $pref_alias = '';
@@ -832,6 +842,8 @@ final class e_core_pref extends e_pref
{
$this->load();
}
}
/**
@@ -928,7 +940,7 @@ class e_plugin_pref extends e_pref
$ret = false;
if($this->plugin_id)
{
$ret = e107::getDb($this->plugin_id)->db_Delete('core', "e107_name='{$this->plugin_id}'");
$ret = e107::getDb($this->plugin_id)->delete('core', "e107_name='{$this->plugin_id}'");
$this->destroy();
}
return $ret;
@@ -982,11 +994,11 @@ class prefs
$Args .= ($Args ? " OR e107_name='{$v}'" : "e107_name='{$v}'");
}
}
if (!$sql->db_Select('core', '*', $Args, 'default'))
if (!$sql->select('core', '*', $Args, 'default'))
{
return FALSE;
}
while ($row = $sql->db_Fetch())
while ($row = $sql->fetch())
{
$this->prefVals['core'][$row['e107_name']] = $row['e107_value'];
}