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

merge from 1.7.3.5(r13153:r13167)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions
Download patch file Download diff file Expand all files Collapse all files

26
modules/trash/trash.model.php
View file

@ -20,6 +20,7 @@ class trashModel extends trash
$oTrashVO = new TrashVO();
if(!$trashSrl) return $oTrashVO;
$args = new stdClass();
$args->trashSrl = $trashSrl;
$output = executeQuery('trash.getTrash', $args, $columnList);
@ -51,6 +52,28 @@ class trashModel extends trash
return $output;
}
/**
* Get TrashVO all list
* @param object $args
* @param array $columnList
* @return object
*/
function getTrashAllList($args, $columnList = array())
{
$output = executeQueryArray('trash.getTrashAllList', $args, $columnList);
if(is_array($output->data))
{
foreach($output->data AS $key=>$value)
{
$oTrashVO = new TrashVO();
$this->_setTrashObject($oTrashVO, $value);
$output->data[$key] = $oTrashVO;
}
}
return $output;
}
/**
* Set trash object from std object
* @param TrashVO $oTrashVO
@ -71,4 +94,5 @@ class trashModel extends trash
$oTrashVO->setRegdate($stdObject->regdate);
}
}
/* End of file trash.model.php */
/* Location: ./modules/trash/trash.model.php */