Merge branch 'g5'

adm/admin.head.php

@@ -41,6 +41,8 @@ function print_menu2($key, $no)
 ?>
 
 <script>
+var g5_admin_url = "<?php echo G5_ADMIN_URL; ?>";
+
 var tempX = 0;
 var tempY = 0;
 

head.sub.php

@@ -76,11 +76,6 @@ var g5_bo_table  = "<?php echo isset($bo_table)?$bo_table:''; ?>";
 var g5_sca       = "<?php echo isset($sca)?$sca:''; ?>";
 var g5_editor    = "<?php echo ($config['cf_editor'] && $board['bo_use_dhtml_editor'])?$config['cf_editor']:''; ?>";
 var g5_cookie_domain = "<?php echo G5_COOKIE_DOMAIN ?>";
-<?php
-if ($is_admin) {
-    echo 'var g5_admin_url = "'.G5_ADMIN_URL.'";'.PHP_EOL;
-}
-?>
 </script>
 <script src="<?php echo G5_JS_URL ?>/jquery-1.8.3.min.js"></script>
 <?php

theme/basic/head.sub.php

@@ -65,11 +65,6 @@ var g5_bo_table  = "<?php echo isset($bo_table)?$bo_table:''; ?>";
 var g5_sca       = "<?php echo isset($sca)?$sca:''; ?>";
 var g5_editor    = "<?php echo ($config['cf_editor'] && $board['bo_use_dhtml_editor'])?$config['cf_editor']:''; ?>";
 var g5_cookie_domain = "<?php echo G5_COOKIE_DOMAIN ?>";
-<?php
-if ($is_admin) {
-    echo 'var g5_admin_url = "'.G5_ADMIN_URL.'";'.PHP_EOL;
-}
-?>
 </script>
 <script src="<?php echo G5_JS_URL ?>/jquery-1.8.3.min.js"></script>
 <?php
@@ -89,6 +84,8 @@ if (defined('_SHOP_')) {
 if(G5_IS_MOBILE) {
     echo '<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>'.PHP_EOL; // overflow scroll 감지
 }
+if(!defined('G5_IS_ADMIN'))
+    echo $config['cf_add_script'];
 ?>
 </head>
 <body<?php echo isset($g5['body_script']) ? $g5['body_script'] : ''; ?>>