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

@ -1,4 +1,4 @@
<load target="../../../../common/js/jquery.js" />
<load target="../../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
<load target="./filter/openid_login.xml" />
<load target="./message.css" />
<load target="./message.js" />
@ -8,7 +8,7 @@
<div id="loginAccess" class="gLogin">
<h1>{$system_message}</h1>
<div class="mLogin" id="gLogin" cond="!$is_logged && $module == 'admin'">
<form ruleset="@login" action="./" method="post" id="gForm">
<form ruleset="@login" action="{getUrl('','act','procMemberLogin')}" method="post" id="gForm">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />