fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 10:41:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix unintended change at file searching

Browse source 
#1518 에서 지적 받은 내용 수정
This commit is contained in:
Min-Soo Kim 2020-12-23 22:14:31 +09:00 • committed by GitHub
parent 97fc096fbd
commit 5d39fe938a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/file/file.admin.model.php
View file

@ -75,9 +75,9 @@ class fileAdminModel extends file
elseif($obj->direct_download == 'N') $args->direct_download= 'N';
// Set variables
$args->sort_index = $obj->sort_index;
$args->page = $obj->page?? 1;
$args->list_count = $obj->list_count?? 20;
$args->page_count = $obj->page_count?? 10;
$args->page = isset($obj->page) ? ($obj->page ? $obj->page : 1) : 1;
$args->list_count = isset($obj->list_count) ? ($obj->list_count? $obj->list_count : 20) : 20;
$args->page_count = isset($obj->page_count) ? ($obj->page_count? $obj->page_count : 10) : 10;
$args->s_module_srl = $obj->module_srl;
$args->exclude_module_srl = $obj->exclude_module_srl;
if(toBool($obj->exclude_secret))
@ -165,8 +165,8 @@ class fileAdminModel extends file
protected function _makeSearchParam(&$obj, &$args)
{
// Search options
$search_target = $obj->search_target ?? trim(Context::get('search_target'));
$search_keyword = $obj->search_keyword ?? trim(Context::get('search_keyword'));
$search_target = isset($obj->search_target)? ($obj->search_target? $obj->search_target : trim(Context::get('search_target'))) : trim(Context::get('search_target'));
$search_keyword = isset($obj->search_keyword)? ($obj->search_keyword? $obj->search_keyword : trim(Context::get('search_keyword'))) : trim(Context::get('search_keyword'));
if($search_target && $search_keyword)
{