Merge branch 'develop' into next

This commit is contained in:
Kijin Sung 2020-08-03 14:04:20 +09:00
commit 818897fed4
8 changed files with 31 additions and 13 deletions

View file

@ -2566,7 +2566,7 @@ class memberController extends member
/**
* Nickname and click Log In to add a pop-up menu that appears when the method
*/
function addMemberPopupMenu($url, $str, $icon = '', $target = 'self')
function addMemberPopupMenu($url, $str, $icon = '', $target = 'self', $class = '')
{
$member_popup_menu_list = Context::get('member_popup_menu_list');
if(!is_array($member_popup_menu_list)) $member_popup_menu_list = array();
@ -2574,7 +2574,8 @@ class memberController extends member
$obj = new stdClass;
$obj->url = $url;
$obj->str = $str;
$obj->icon = $icon;
$obj->class = $class;
$obj->icon = $icon ?: null;
$obj->target = $target;
$member_popup_menu_list[] = $obj;