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

Merge branch 'develop' into pr/exception

Browse source
This commit is contained in:
Kijin Sung 2018-09-06 10:45:59 +09:00
commit 4d5401ef89
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/db/DBMysql.class.php
View file

@ -73,7 +73,7 @@ class DBMySQL extends DB
// Check connection error
if($mysqli->connect_errno)
{
$this->setError($mysqli->connect_errno, $mysqli->connect_error());
$this->setError($mysqli->connect_errno, $mysqli->connect_error);
return;
}

16
modules/document/document.admin.controller.php
View file

@ -410,9 +410,13 @@ class documentAdminController extends document
{
return;
}
if(!is_array($document_srl_list))
{
$document_srl_list = array_map('intval', array_map('trim', explode(',', $document_srl_list)));
}
$obj = new stdClass;
$obj->document_srls = implode(',', $document_srl_list);
$obj->document_srls = $document_srl_list;
$obj->list_count = count($document_srl_list);
$obj->document_list = executeQueryArray('document.getDocuments', $obj)->data;
$obj->module_srl = $target_module_srl;
@ -481,9 +485,9 @@ class documentAdminController extends document
$oDB->commit();
// remove from cache
foreach ($document_srl_list as $document_srl)
foreach($obj->document_list as $document)
{
Rhymix\Framework\Cache::delete('document_item:'. getNumberingPath($document_srl) . $document_srl);
Rhymix\Framework\Cache::delete('document_item:'. getNumberingPath($document->document_srl) . $document->document_srl);
}
return new BaseObject();
@ -502,9 +506,13 @@ class documentAdminController extends document
{
return;
}
if(!is_array($document_srl_list))
{
$document_srl_list = array_map('intval', array_map('trim', explode(',', $document_srl_list)));
}
$obj = new stdClass;
$obj->document_srls = implode(',', $document_srl_list);
$obj->document_srls = $document_srl_list;
$obj->list_count = count($document_srl_list);
$obj->document_list = executeQueryArray('document.getDocuments', $obj)->data;
$obj->module_srl = $target_module_srl;