Skip to content

Commit 08fc410

Browse files
authored
Merge pull request #619 from NetCommons3/fix_lang
fix: 言語パラメータlangにja,en以外を指定した場合、デフォルト値を使用するように修正
2 parents 5317f5f + 0549aa7 commit 08fc410

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Controller/NetCommonsAppController.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,10 @@ public function afterFilter() {
306306
protected function _setLanguage() {
307307
if (isset($this->request->query['lang']) &&
308308
! array_key_exists('search', $this->request->query)) {
309+
if (!is_string($this->request->query['lang']) ||
310+
!in_array($this->request->query['lang'], ['ja', 'en'], true)) {
311+
$this->request->query['lang'] = Configure::read('Config.language');
312+
}
309313
Configure::write('Config.language', $this->request->query['lang']);
310314
$this->Session->write('Config.language', $this->request->query['lang']);
311315

0 commit comments

Comments
 (0)