merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -1,10 +1,20 @@
<?php
/**
* trashModel class
* trash the module's model class
*
* @author NHN (developers@xpressengine.com)
* @package /modules/trash
* @version 0.1
*/
class trashModel extends trash
{
/**
* @brief get one trash object
**/
* Get one trash object
* @param int $trashSrl
* @pram array $columnList
* @return TrashVO
*/
function getTrash($trashSrl, $columnList = array())
{
$oTrashVO = new TrashVO();
@ -20,8 +30,11 @@ class trashModel extends trash
}
/**
* @brief get trash object list
**/
* Get TrashVO list
* @param object $args
* @param array $columnList
* @return object
*/
function getTrashList($args, $columnList = array())
{
$output = executeQueryArray('trash.getTrashList', $args, $columnList);
@ -39,8 +52,11 @@ class trashModel extends trash
}
/**
* @brief set trash object from std object
**/
* Set trash object from std object
* @param TrashVO $oTrashVO
* @param object $stdObject
* @return void
*/
function _setTrashObject(&$oTrashVO, $stdObject)
{
$oTrashVO->setTrashSrl($stdObject->trash_srl);