Merge branch 'master' of github.com:gnuboard/g5

This commit is contained in:
whitedot
2013-12-12 09:46:25 +09:00
4 changed files with 60 additions and 36 deletions

View File

@ -22,7 +22,7 @@ if (!isset($board['bo_device'])) {
}
if (!isset($board['bo_show_menu'])) {
sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_show_menu` TINYINT NOT NULL DEFAULT '0' AFTER `bo_order_search`, ADD `bo_order` INT NOT NULL DEFAULT '0' AFTER `bo_show_menu` ", false);
sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_show_menu` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_search`, ADD `bo_order` INT NOT NULL DEFAULT '0' AFTER `bo_show_menu` ", false);
}
if (!isset($board['bo_mobile_skin'])) {

View File

@ -123,9 +123,9 @@ if(empty($qaconfig)) {
</td>
</tr>
<tr>
<th scope="row"><label for="qa_skin">모바일 스킨 디렉토리<strong class="sound_only">필수</strong></label></th>
<th scope="row"><label for="qa_mobile_skin">모바일 스킨 디렉토리<strong class="sound_only">필수</strong></label></th>
<td>
<?php echo get_mobile_skin_select('qa', 'qa_skin', 'qa_skin', $qaconfig['qa_skin'], 'required'); ?>
<?php echo get_mobile_skin_select('qa', 'qa_mobile_skin', 'qa_mobile_skin', $qaconfig['qa_mobile_skin'], 'required'); ?>
</td>
</tr>
<tr>