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.head.php
	head.php
This commit is contained in:
whitedot
2012-12-26 15:22:03 +09:00
parent a9423930ff e7b5429b4b
commit 32669ce3f3
7 changed files with 118 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
adm/admin.head.php
View File

@ -100,13 +100,21 @@ function textarea_size(fld, size)
$href2 = '</a>';
}
$current_class = "";
<<<<<<< HEAD
if ((isset($sub_menu) && substr($sub_menu, 0, 2) == substr($menu['menu'.$key][0][0], 0, 2)) || defined('_ADMIN_INDEX_'))
=======
if (isset($sub_menu) && (substr($sub_menu, 0, 2) == substr($menu['menu'.$key][0][0], 0, 2) || defined('_ADMIN_INDEX_')))
>>>>>>> e7b5429b4b7a43150b180dc9efa62eaf13e8b6f7
$current_class = " gnb_1depth_on";
echo "<li class=\"gnb_1depth".$current_class."\">";
echo $href1 . $menu['menu'.$key][0][1] . $href2;
echo print_menu1('menu'.$key, 1);
echo "</li>";
<<<<<<< HEAD
if ($current_class || !defined('_ADMIN_INDEX_')) $current_class = ""; // 클래스 반복부여 방지
=======
if ($current_class || !_ADMIN_INDEX_) $current_class = ""; // 클래스 반복부여 방지
>>>>>>> e7b5429b4b7a43150b180dc9efa62eaf13e8b6f7
}
?>