merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -3,9 +3,10 @@
<table name="modules" />
</tables>
<columns>
<column name="is_skin_fix" var="is_skin_fix" />
<column name="is_skin_fix" default="Y" />
</columns>
<conditions>
<condition operation="in" column="module_srl" var="module_srls" notnull="notnull" />
<condition operation="notnull" column="skin" />
<condition operation="notequal" column="skin" default=" " pipe="or" />
</conditions>
</query>