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

Conflicts:
	adm/config_form.php
This commit is contained in:
gnuboard committed 2013-04-25 18:39:48 +09:00
commit 15fc3e7087
10 files changed
+106 -43

No files matched your search

+3
View File
@@ -263,4 +263,7 @@ if (isset($sfl)) $arr_query[] = 'sfl='.$sfl;
if (isset($stx)) $arr_query[] = 'stx='.$stx;
if (isset($page)) $arr_query[] = 'page='.$page;
$qstr = implode("&", $arr_query);
// 관리자에서는 추가 스크립트는 사용하지 않는다.
$config['cf_add_script'] = '';
?>