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

@ -61,7 +61,7 @@
<p class="q">{$lang->allow_message}</p>
<p class="a">
<block loop="$lang->allow_message_type=>$key,$val">
<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key || (!$member_info->member_srl && $key == 'Y')" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
</block>
</p>
</li>
@ -91,7 +91,7 @@
<li>
<p class="q"><label for="description">{$lang->description}</label></p>
<p class="a">
<textarea name="description" id="description" cols="42" rows="5">{htmlspecialchars($member_info->description)}</textarea>
<textarea name="description" id="description" rows="8" cols="42">{htmlspecialchars($member_info->description)}</textarea>
<span class="desc">{$lang->about_member_description}</span>
</p>
</li>