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

2013-01-21 11:20:50 +09:00
parent 0f58c2b773 346e4acf41
commit 8e58ea138f
21 changed files with 126 additions and 166 deletions
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -1651,8 +1651,7 @@ function get_selected($field, $value, $first=false)
 function skin_path()
 {
    global $g4;
-    $skin_dir = 'skin';
-    $skin_path = $g4['path'].'/'.$skin_dir;
+    $skin_path = $g4['path'].'/'.$g4['skin_dir'];
    if (G4_IS_MOBILE) $skin_path = $g4['mobile_path'].'/'.$skin_dir;
    return $skin_path;
 }