merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -15,7 +15,7 @@
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="@login" action="./" method="post" id="fo_member_login">
<form ruleset="@login" action="{getUrl('','act','procMemberLogin')}" method="post" id="fo_member_login">
<input type="hidden" name="success_return_url" value="{getUrl('act', '')}" />
<fieldset class="login">
<dl>

View file

@ -24,7 +24,7 @@
<table cellspacing="0" class="rowTable">
<tr><th colspan="2" class="title"><div>{$lang->member_default_info}</div></th></tr>
<tr>
<th><div>{$identifierForm->title} *</div></th>
<th><div>{$identifierForm->title} <em style="color:red">*</em></div></th>
<td class="wide">
{$identifierForm->value}
<input type="hidden" name="{$identifierForm->name}" value="{$identifierForm->value}" />

View file

@ -9,7 +9,7 @@
<!--%import("./filter/openid_login.xml")-->
<!--%import("./message.js")-->
<div class="mLogin" id="gLogin">
<form action="./" method="post" ruleset="@login" id="gForm">
<form action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" id="gForm">
<input type="hidden" name="act" value="procMemberLogin" />
<fieldset>
<div class="signPanel">