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

issue 1793 check null parameter in method.

Browse source 
and 'notnull' attribute add to query


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10494 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-03-29 05:56:33 +00:00
parent 5c3bcb2239
commit 711109672f
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -722,11 +722,14 @@ class documentController extends document {
return $output; return $output;
} }
$output = $oDB->executeQuery('document.updateDocumentExtraKeyIdxOrder', $obj); if($var_idx != NULL)
if(!$output->toBool())
{ {
$oDB->rollback(); $output = $oDB->executeQuery('document.updateDocumentExtraKeyIdxOrder', $obj);
return $output; if(!$output->toBool())
{
$oDB->rollback();
return $output;
}
} }
$output = executeQuery('document.deleteDocumentExtraVars', $obj); $output = executeQuery('document.deleteDocumentExtraVars', $obj);
@ -736,11 +739,14 @@ class documentController extends document {
return $output; return $output;
} }
$output = $oDB->executeQuery('document.updateDocumentExtraVarIdxOrder', $obj); if($var_idx != NULL)
if(!$output->toBool())
{ {
$oDB->rollback(); $output = $oDB->executeQuery('document.updateDocumentExtraVarIdxOrder', $obj);
return $output; if(!$output->toBool())
{
$oDB->rollback();
return $output;
}
} }
$oDB->commit(); $oDB->commit();

2
modules/document/queries/updateDocumentExtraKeyIdxOrder.xml
View file

@ -7,6 +7,6 @@
</columns> </columns>
<conditions> <conditions>
<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" /> <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
<condition operation="excess" column="var_idx" var="var_idx" filter="number" pipe="and" /> <condition operation="excess" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
</conditions> </conditions>
</query> </query>

2
modules/document/queries/updateDocumentExtraVarIdxOrder.xml
View file

@ -7,6 +7,6 @@
</columns> </columns>
<conditions> <conditions>
<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" /> <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
<condition operation="excess" column="var_idx" var="var_idx" filter="number" pipe="and" /> <condition operation="excess" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
</conditions> </conditions>
</query> </query>