mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1742 from durandalwoz/master

Browse Source 
Avatar shortcode for forum templates and encoding fix for date
This commit is contained in:
Cameron 2016-08-30 11:13:08 -07:00 committed by GitHub
commit 2ea362a328
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/date_handler.php
View File

@ -197,7 +197,7 @@ class convert
break;
}
return strftime($mask, $datestamp);
return utf8_encode(strftime($mask, $datestamp));
}

4
e107_plugins/forum/shortcodes/batch/forum_shortcodes.php
View File

@ -699,4 +699,8 @@ $gen = new convert;
return $frm->breadcrumb($breadarray);
}
function sc_avatar($opts)
{
return e107::getParser()->toAvatar(e107::user($this->var['forum_lastpost_user']),$opts);
}
}

13
e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php
View File

@ -888,5 +888,18 @@ $LASTPOSTUSER = $this->var['lastpost_username'];
}
*/
function sc_avatar($opts)
{
if (isset($this->var['thread_id']))
{
return e107::getParser()->toAvatar(e107::user($this->var['thread_lastuser']),$opts);
}
elseif (isset($this->var['forum_id']))
{
return e107::getParser()->toAvatar(e107::user($this->var['forum_lastpost_user']),$opts);
}
return '';
}
}
?>