merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -9,7 +9,5 @@
<if test="!$member_srl" attr="length" value="3:20" />
</field>
<field name="nick_name" required="true" />
<field name="find_account_question" required="true" />
<field name="find_account_answer" required="true" length=":250" />
</fields>
</ruleset>

View file

@ -4,7 +4,7 @@
</customrules>
<fields>
<field name="column_type" required="true" />
<field name="column_name" required="true" rule="alpha_number" />
<field name="column_id" required="true" rule="alpha_number" />
<field name="column_title" required="true" />
</fields>
</ruleset>

View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset version="1.5.0">
<customrules>
</customrules>
<fields>
<field name="password" required="true" />
</fields>
</ruleset>

View file

@ -3,7 +3,6 @@
<customrules>
</customrules>
<fields>
<field name="openid" required="true" />
<field name="referer_url" required="true" />
<field name="email_address" required="true" length="1:200" rule="email" />
</fields>
</ruleset>