1
0
mirror of https://github.com/e107inc/e107.git synced 2025-04-16 10:32:08 +02:00

Default icon now shown in admin area if none provided by plugin.

This commit is contained in:
Cameron 2015-04-06 17:28:08 -07:00
parent a69794bd56
commit 72a7fd4b45
2 changed files with 11 additions and 4 deletions

View File

@ -561,8 +561,15 @@ class userlogin
protected function logNote($title, $text)
{
$title = e107::getParser()->toDB($title);
$text = e107::getParser()->toDB($text);
e107::getLog()->e_log_event(4, __FILE__."|".__FUNCTION__."@".__LINE__, "LOGIN", $title, $text, FALSE, LOG_TO_ROLLING);
// $text = e107::getParser()->toDB($text);
// $text = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS_);
$debug = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS,2);
// $array = debug_backtrace();
// e107::getLog()->e_log_event(4, $array, "LOGIN", $title, $text, FALSE, LOG_TO_ROLLING);
e107::getLog()->e_log_event(4, $debug[1]['file']."|".$debug[1]['function']."@".$debug[1]['line'], "LOGIN", $title, $debug, FALSE, LOG_TO_ROLLING);
}

View File

@ -979,8 +979,8 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
$eplug_name = $tp->toHTML($name,FALSE,"defs, emotes_off");
$eplug_conffile = $att['url'];
$eplug_icon_small = $plugin_path.'/'.$att['iconSmall'];
$eplug_icon = $plugin_path.'/'.$att['icon'];
$eplug_icon_small = (!empty($att['iconSmall'])) ? $plugin_path.'/'.$att['iconSmall'] : '';
$eplug_icon = (!empty($att['icon'])) ? $plugin_path.'/'.$att['icon'] : '';
$eplug_caption = str_replace("'", '', $tp->toHTML($att['description'], FALSE, 'defs, emotes_off'));
if (varset($eplug_conffile))