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

Conflicts: bbs/register_form.php
2013-02-01 14:31:44 +09:00
parent b4d8615d63 011bc2915a
commit 53342f3210
5 changed files with 43 additions and 20 deletions
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -128,7 +128,7 @@ function get_cookie($cookie_name)


 // 경고메세지를 경고창으로
-function alert($msg='', $url='', $error=true)
+function alert($msg='', $url='', $error=true, $post=false)
 {
    global $g4, $config, $member;
    global $is_admin;