fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 17:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Also apply #2192 fix to document and comment modules; defend null

Browse source
This commit is contained in:
Kijin Sung 2023-10-03 14:32:15 +09:00
parent ce3f5e98d2
commit 433103bf92
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/comment/comment.model.php
View file

@ -119,12 +119,10 @@ class CommentModel extends Comment
}
// Changing a language of pop-up menu
$menus = Context::get('comment_popup_menu_list');
$menus_count = count($menus);
for($i = 0; $i < $menus_count; $i++)
$menus = Context::get('comment_popup_menu_list') ?: [];
foreach ($menus as $menu)
{
$menus[$i]->str = lang($menus[$i]->str);
$menu->str = lang($menu->str ?? '');
}
// get a list of final organized pop-up menus

7
modules/document/document.model.php
View file

@ -592,11 +592,10 @@ class DocumentModel extends Document
}
}
// Changing the language of pop-up menu
$menus = Context::get('document_popup_menu_list');
$menus_count = count($menus);
for($i=0;$i<$menus_count;$i++)
$menus = Context::get('document_popup_menu_list') ?: [];
foreach ($menus as $menu)
{
$menus[$i]->str = lang($menus[$i]->str);
$menu->str = lang($menu->str ?? '');
}
// Wanted to finally clean pop-up menu list
$this->add('menus', $menus);

2
modules/member/member.model.php
View file

@ -336,7 +336,7 @@ class MemberModel extends Member
$menus = Context::get('member_popup_menu_list') ?: [];
foreach ($menus as $menu)
{
$menu->str = lang($menu->str);
$menu->str = lang($menu->str ?? '');
}
// Get a list of finalized pop-up menu
$this->add('menus', $menus);