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

issue 2662 trash, widget, session, trackback, spamfilter, tag

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12260 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-11-20 03:01:32 +00:00
parent e1a22ca6f0
commit 5219a360c6
31 changed files with 3465 additions and 3173 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/trash/trash.admin.controller.php
View file

@ -159,7 +159,8 @@ class trashAdminController extends trash
$originObject = unserialize($output->data->getSerializedObject());
$output = $oAdminController->restoreTrash($originObject);
if(!$output->toBool()) {
if(!$output->toBool())
{
$oDB->rollback();
return new Object(-1, $output->message);
}
@ -189,7 +190,8 @@ class trashAdminController extends trash
$trashSrls = Context::get('trash_srls');
if($trashSrls) $trashSrlList = explode(',', $trashSrls);
if(count($trashSrlList) > 0) {
if(count($trashSrlList) > 0)
{
$oTrashModel = &getModel('trash');
$args->trashSrl = $trashSrlList;
$output = $oTrashModel->getTrashList($args);
@ -220,6 +222,5 @@ class trashAdminController extends trash
return true;
}
}
/* End of file trash.controller.php */
/* Location: ./modules/trash/trash.controller.php */
/* End of file trash.admin.controller.php */
/* Location: ./modules/trash/trash.admin.controller.php */