diff --git a/module/common/view/header.lite.html.php b/module/common/view/header.lite.html.php index d41f3fc039..6879c23f25 100755 --- a/module/common/view/header.lite.html.php +++ b/module/common/view/header.lite.html.php @@ -10,7 +10,7 @@ $clientTheme = $this->app->getClientTheme(); $onlybody = zget($_GET, 'onlybody', 'no'); ?> - + @@ -32,7 +32,7 @@ $onlybody = zget($_GET, 'onlybody', 'no'); js::import($jsRoot . 'jquery/lib.js'); js::import($jsRoot . 'zui/min.js?t=' . $timestamp); - if($clientLang === 'ja') js::import($jsRoot . 'zui/lang.' .$clientLang . '.min.js?t=' . $timestamp); + if($clientLang === 'ja') js::import($jsRoot . 'zui/lang.' . $clientLang . '.min.js?t=' . $timestamp); js::import($jsRoot . 'my.full.js?t=' . $timestamp); } @@ -42,6 +42,7 @@ $onlybody = zget($_GET, 'onlybody', 'no'); if(!file_exists($this->app->getThemeRoot() . 'default/' . $this->cookie->lang . '.' . $this->cookie->theme . '.css')) $minCssFile = $defaultTheme . 'en.' . $this->cookie->theme . '.css'; css::import($minCssFile); js::import($jsRoot . 'all.js'); + if($clientLang === 'ja') js::import($jsRoot . 'zui/lang.' . $clientLang . '.min.js'); } if($this->app->getViewType() == 'xhtml') css::import($defaultTheme . 'x.style.css'); diff --git a/module/report/model.php b/module/report/model.php index b6948472b2..1f5daab3c2 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -536,7 +536,7 @@ class reportModel extends model * @param string $account * @param int $year * @access public - * @return int + * @return object */ public function getUserYearEfforts($account, $year) {