interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.1.1

Browse Source
This commit is contained in:
Bastian Allgeier
2019-03-26 11:00:03 +01:00
parent bdc985b861
commit 852a14595e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kirby/composer.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "getkirby/cms", "name": "getkirby/cms",
"description": "The Kirby 3 core", "description": "The Kirby 3 core",
"version": "3.1.0", "version": "3.1.1",
"license": "proprietary", "license": "proprietary",
"keywords": ["kirby", "cms", "core"], "keywords": ["kirby", "cms", "core"],
"homepage": "https://getkirby.com", "homepage": "https://getkirby.com",

5
kirby/config/routes.php
View File

@@ -111,6 +111,7 @@ return function ($kirby) {
'action' => function () use ($kirby) { 'action' => function () use ($kirby) {
$home = $kirby->site()->homePage(); $home = $kirby->site()->homePage();
// language detection on the home page with / as URL
if ($home && $kirby->url() !== $home->url()) { if ($home && $kirby->url() !== $home->url()) {
if ($kirby->option('languages.detect') === true) { if ($kirby->option('languages.detect') === true) {
return $kirby return $kirby
@@ -121,8 +122,10 @@ return function ($kirby) {
->response() ->response()
->redirect($kirby->site()->url()); ->redirect($kirby->site()->url());
} }
// default home page
} else { } else {
return $kirby->resolve(null, $kirby->detectedLanguage()->code()); return $kirby->resolve(null, $kirby->defaultLanguage()->code());
} }
} }
]; ];