merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -3,7 +3,8 @@
<table name="comments" />
<table name="documents" type="left outer join" >
<conditions>
<condition operation="equal" column="comments.document_srl" default="documents.document_srl" />
<condition operation="equal" column="comments.status" default="1" pipe="and" />
<condition operation="equal" column="comments.document_srl" default="documents.document_srl" pipe="and" />
</conditions>
</table>
</tables>