Mirrors/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-02-20 19:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changelog update

Browse Source
This commit is contained in:
Matias Griese 2019-06-27 17:59:05 +03:00
parent 91d20d8840
commit 3f176c1924
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@
* Fixed some potential issues when `$grav['user']` is not set
* Fixed `.md` page to be assigned to the default language and to be listed in translated/untranslated page list
* Fixed `Language::getFallbackPageExtensions()` to append `.md` file after the default language extension
* Fixed `Language::getFallbackPageExtensions()` returning wrong file extensions when passing custom page extension
# v1.6.11
## 06/21/2019

14
system/src/Grav/Common/Language/Language.php
View File

@ -58,7 +58,7 @@ class Language
$this->default = reset($this->languages);
}
$this->page_extensions = null;
$this->page_extensions = [];
if (empty($this->languages)) {
$this->enabled = false;
@ -285,7 +285,9 @@ class Language
*/
public function getFallbackPageExtensions($file_ext = null)
{
if (empty($this->page_extensions)) {
$file_ext = (string)$file_ext;
if (!isset($this->page_extensions[$file_ext])) {
if (!$file_ext) {
$file_ext = CONTENT_EXT;
}
@ -320,13 +322,13 @@ class Language
}
}
$this->page_extensions = array_values($valid_lang_extensions);
$this->page_extensions[$file_ext] = array_values($valid_lang_extensions);
} else {
$this->page_extensions = (array)$file_ext;
$this->page_extensions[$file_ext] = (array)$file_ext;
}
}
return $this->page_extensions;
return $this->page_extensions[$file_ext];
}
/**
@ -342,7 +344,7 @@ class Language
*/
public function resetFallbackPageExtensions()
{
$this->page_extensions = null;
$this->page_extensions = [];
}
/**