Merge branch 'g4s'

2013-06-04 18:52:24 +09:00
parent fec8ac4a8f f23b557871
commit b6aa16deac
32 changed files with 123 additions and 66 deletions
--- a/head.sub.php
+++ b/head.sub.php
@ -78,7 +78,7 @@ if ($is_admin) {
 if(G4_IS_MOBILE) {
    echo '<script> set_cookie("device_width", screen.width, 6, g4_cookie_domain); </script>'.PHP_EOL;
 }
-if(!defined('G4_IS_ADMIN'))
+//if(!defined('G4_IS_ADMIN'))
    echo $config['cf_add_script'];
 ?>
 </head>