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

Conflicts:
	shop/item.php
	shop/itemqa.php
	shop/itemqaform.php
	shop/itemqaformupdate.php
This commit is contained in:
gnuboard committed 2013-06-18 11:03:20 +09:00
commit 4e37dc6abd
61 files changed
+1010 -780

No files matched your search

+2 -2
View File
@@ -884,8 +884,8 @@ function alert_opener($msg='', $url='')
if (!$msg) $msg = '올바른 방법으로 이용해 주십시오.';
echo "<meta http-equiv=\"content-type\" content=\"text/html; charset={$g4['charset']}\">";
echo "<script type='text/javascript'>";
echo "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">";
echo "<script>";
echo "alert(\"$msg\");";
echo "opener.location.href=\"$url\";";
echo "self.close();";