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

@ -3,7 +3,7 @@
<table width="100%" border="1" cellspacing="0">
<!--@foreach($member_config->signupForm as $no=>$formInfo)-->
<!--@if($formInfo->isDefaultForm)-->
{@$title = $formInfo->title}
{@$title = Context::getLang($formInfo->name)}
{@$value = $memberInfo[$formInfo->name]}
<!--@if($formInfo->name == 'find_account_question')-->
{@$value = $lang->find_account_question_items[$value].' : '.$memberInfo['find_account_answer']}