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

@ -24,7 +24,7 @@
<li style="display:none"|cond="$config->allow_outlink == 'N'" class="_outLink">
<p class="q">{$lang->allow_outlink_site}</p>
<p class="a">
<textarea type="text" name="allow_outlink_site">{$config->allow_outlink_site}</textarea>
<textarea type="text" name="allow_outlink_site" rows="8" cols="42">{$config->allow_outlink_site}</textarea>
<p>{$lang->about_allow_outlink_site}</p>
</p>
</li>