g5 merge 충돌 수정

2015-11-24 11:38:18 +09:00
parent 9afb28efba 33e9d1e1d0
commit bfaa429721
57 changed files with 193 additions and 64 deletions
--- a/adm/newwinformupdate.php
+++ b/adm/newwinformupdate.php
@ -10,6 +10,10 @@ if ($w == 'd')
 else
    auth_check($auth[$sub_menu], "w");

+
+check_admin_token();
+
+
 $sql_common = " nw_division = '{$_POST['nw_division']}',
                nw_device = '{$_POST['nw_device']}',
                nw_begin_time = '{$_POST['nw_begin_time']}',