merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -101,6 +101,13 @@
</tr>
<!--@end-->
<!--@if($module_info->page_type == 'ARTICLE')-->
<tr>
<th scope="row">{$lang->skin_fix}</th>
<td class="text">
<input type="checkbox" name="is_skin_fix" id="is_skin_fix" value="Y" checked="checked"|cond="$module_info->is_skin_fix == 'Y'" />
<p>{$lang->about_skin_fix}</p>
</td>
</tr>
<tr>
<th scope="row">{$lang->skin}</th>
<td class="text">