merge from branch luminous (version 1.5.4.2, ~r12561)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions

View file

@ -3,6 +3,7 @@
<table name="member_autologin" />
</tables>
<conditions>
<condition operation="equal" column="autologin_key" var="autologin_key" notnull="notnull" />
<condition operation="equal" column="autologin_key" var="autologin_key" />
<condition operation="equal" column="member_srl" var="member_srl" pipe="or" />
</conditions>
</query>

View file

@ -6,6 +6,6 @@
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="email_address" var="email_address" notnull="notnull" />
<condition operation="equal" column="lower(email_address)" var="email_address" notnull="notnull" />
</conditions>
</query>

View file

@ -3,7 +3,7 @@
<table name="member_scrap" />
</tables>
<columns>
<column name="count(*)" alias="count" />
<column name="count(document_srl)" alias="count" />
</columns>
<conditions>
<condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />