mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

More avatar code moved to $tp->toAvatar() and minor css fixes.

Browse Source
This commit is contained in:
Cameron
2015-02-05 00:02:29 -08:00
parent 2b83a64f16
commit 9ddada154f
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/includes/infopanel.php
View File

@@ -492,12 +492,12 @@ class adminstyle_infopanel
{ {
$hide = ($count > 3) ? ' hide' : ''; $hide = ($count > 3) ? ' hide' : '';
$TEMPLATE = "{SETIMAGE: w=40} $TEMPLATE = "{SETIMAGE: w=40&h=40}
<li id='comment-".$row['comment_id']."' class='media".$hide."'> <li id='comment-".$row['comment_id']."' class='media".$hide."'>
<span class='media-object pull-left'>{USER_AVATAR=".$row['comment_author_id']."}</span> <span class='media-object pull-left'>{USER_AVATAR=".$row['comment_author_id']."}</span>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>
<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='delete' class='btn btn-mini btn-danger'><i class='icon-remove'></i> Delete</button> <button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='delete' class='btn btn-sm btn-mini btn-danger'><i class='icon-remove'></i> Delete</button>
<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='approve' class='btn btn-mini btn-success'><i class='icon-ok'></i> Approve</button> <button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='approve' class='btn btn-sm btn-mini btn-success'><i class='icon-ok'></i> Approve</button>
</div> </div>
<div class='media-body'><small class='muted smalltext'>Posted by {USERNAME} {TIMEDATE=relative}</small><br /> <div class='media-body'><small class='muted smalltext'>Posted by {USERNAME} {TIMEDATE=relative}</small><br />
<p>{COMMENT}</p> <p>{COMMENT}</p>

5
e107_handlers/plugin_class.php
View File

@@ -3003,10 +3003,11 @@ class e107plugin
$ret['menuName'] = varset($eplug_menu_name); $ret['menuName'] = varset($eplug_menu_name);
if (varset($eplug_prefs))
if (!empty($eplug_prefs) && is_array($eplug_prefs))
{ {
$c = 0; $c = 0;
foreach ($eplug_prefs as $name => $value) foreach($eplug_prefs as $name => $value)
{ {
$ret['mainPrefs']['pref'][$c]['@attributes']['name'] = $name; $ret['mainPrefs']['pref'][$c]['@attributes']['name'] = $name;
$ret['mainPrefs']['pref'][$c]['@value'] = $value; $ret['mainPrefs']['pref'][$c]['@value'] = $value;

2
e107_plugins/pm/pm_shortcodes.php
View File

@@ -413,7 +413,7 @@ class pm_shortcodes extends e_shortcode
public function sc_pm_avatar() public function sc_pm_avatar()
{ {
return e107::getParser()->parseTemplate("{USER_AVATAR={$this->var['user_image']}}"); return e107::getParser()->toAvatar($this->var);
} }