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

@ -4,6 +4,7 @@
<table name="member_autologin" alias="member_autologin" />
</tables>
<columns>
<column name="member.email_address" alias="email_address" />
<column name="member.user_id" alias="user_id" />
<column name="member.password" alias="password" />
<column name="member_autologin.autologin_key" alias="autologin_key" />

View file

@ -0,0 +1,12 @@
<query id="updateMemberFindQuesionAnswer" action="update">
<tables>
<table name="member" />
</tables>
<columns>
<column name="find_account_question" var="find_account_question" />
<column name="find_account_answer" var="find_account_answer" />
</columns>
<conditions>
<condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" />
</conditions>
</query>