Merge remote-tracking branch 'upstream/develop' into item-distribution

This commit is contained in:
Michael 2018-04-24 04:23:38 +00:00
commit 7230cc0bed
16 changed files with 108 additions and 95 deletions

View file

@ -191,7 +191,7 @@ function profile_content(App $a, $update = 0)
$o .= Widget::commonFriendsVisitor($a->profile['profile_uid']);
if (x($_SESSION, 'new_member') && $is_owner) {
$o .= '<a href="newmember" id="newmember-tips" style="font-size: 1.2em;"><b>' . L10n::t('Tips for New Members') . '</b></a>' . EOL;
$o .= '<div id="newmember-tips"><a href="newmember"><b>' . L10n::t('Tips for New Members') . '</b></a></div>';
}
$commpage = $a->profile['page-flags'] == PAGE_COMMUNITY;