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

Merge from 1.5.2.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10519 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-04-02 09:30:09 +00:00
parent 9bf08cf3df
commit 361cd64c16
86 changed files with 804 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/document/document.controller.php
View file

@ -170,7 +170,7 @@ class documentController extends document {
{
return new Object(-1, 'msg_not_permitted');
}
if(!$category_list[$obj->category_srl]) $obj->category_srl = 0;
if(count($category_list) > 0 && !$category_list[$obj->category_srl]) $obj->category_srl = 0;
}
// Set the read counts and update order.
if(!$obj->readed_count) $obj->readed_count = 0;
@ -722,11 +722,14 @@ class documentController extends document {
return $output;
}
$output = $oDB->executeQuery('document.updateDocumentExtraKeyIdxOrder', $obj);
if(!$output->toBool())
if($var_idx != NULL)
{
$oDB->rollback();
return $output;
$output = $oDB->executeQuery('document.updateDocumentExtraKeyIdxOrder', $obj);
if(!$output->toBool())
{
$oDB->rollback();
return $output;
}
}
$output = executeQuery('document.deleteDocumentExtraVars', $obj);
@ -736,11 +739,14 @@ class documentController extends document {
return $output;
}
$output = $oDB->executeQuery('document.updateDocumentExtraVarIdxOrder', $obj);
if(!$output->toBool())
if($var_idx != NULL)
{
$oDB->rollback();
return $output;
$output = $oDB->executeQuery('document.updateDocumentExtraVarIdxOrder', $obj);
if(!$output->toBool())
{
$oDB->rollback();
return $output;
}
}
$oDB->commit();