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

2017-12-04 16:52:47 +09:00
parent 91af15ab81 5a424d5977
commit b410204ed7
13 changed files with 79 additions and 43 deletions
--- a/adm/admin.lib.php
+++ b/adm/admin.lib.php
@ -176,7 +176,7 @@ function get_theme_config_value($dir, $key='*')
    $tconfig = array();

    $theme_config_file = G5_PATH.'/'.G5_THEME_DIR.'/'.$dir.'/theme.config.php';
-    if(is_file) {
+    if(is_file($theme_config_file)) {
        include($theme_config_file);

        if($key == '*') {