firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

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

Browse Source 
Conflicts:
	adm/admin.menu500.shop_2of2.php
This commit is contained in:
gnuboard
2013-01-28 17:21:53 +09:00
parent a47f731488 e82fa69b4c
commit be5ea2287a
3 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
adm/shop_admin/itemform.php
View File

@ -1,7 +1,8 @@
<?
$sub_menu = "400300";
define('G4_EDITOR', 1);
//define('G4_EDITOR', 1);
include_once("./_common.php");
include_once(G4_CKEDITOR_PATH.'/ckeditor.lib.php');
auth_check($auth[$sub_menu], "w");