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

@ -8,8 +8,8 @@
<input type="hidden" name="page" value="{$page}" />
<ul>
<li>
<p class="q"><label for="uid">{$lang->user_id}</label></p>
<p class="a"><input type="text" disabled="disabled" value="{$member_info->user_id}" id="uid" /></p>
<p class="q"><label for="uid">{Context::getLang($identifier)}</label></p>
<p class="a"><input type="text" disabled="disabled" value="{$formValue}" id="uid" /></p>
</li>
<li>
<p class="q"><label for="cpw">{$lang->current_password}</label></p>