Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-04 11:31:43 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/feature/1.6-controller' into feature/1.6-controller

Browse Source
This commit is contained in:
Matias Griese
2018-10-29 08:27:36 +02:00
parent 092ecd1417 ff54dc82ff
commit 5b097fc038
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ class Language
public function init()
{
$this->default = reset($this->languages);
$this->page_extensions = null;
if (empty($this->languages)) {
$this->enabled = false;

21
system/src/Grav/Common/Page/Page.php
View File

@@ -126,6 +126,17 @@ class Page implements PageInterface
{
$config = Grav::instance()['config'];
// some extension logic
if (empty($extension)) {
$this->extension('.' . $file->getExtension());
} else {
$this->extension($extension);
}
// extract page language from page extension
$language = trim(basename($this->extension(), 'md'), '.') ?: null;
$this->language($language);
$this->hide_home_route = $config->get('system.home.hide_in_urls', false);
$this->home_route = $this->adjustRouteCase($config->get('system.home.alias'));
$this->filePath($file->getPathName());
@@ -142,16 +153,6 @@ class Page implements PageInterface
$this->published();
$this->urlExtension();
// some extension logic
if (empty($extension)) {
$this->extension('.' . $file->getExtension());
} else {
$this->extension($extension);
}
// extract page language from page extension
$language = trim(basename($this->extension(), 'md'), '.') ?: null;
$this->language($language);
return $this;
}

2
system/src/Grav/Common/Page/Pages.php
View File

@@ -1051,7 +1051,7 @@ class Pages
$folders = [];
$page_found = null;
$page_extension = '';
$page_extension = '.md';
$last_modified = 0;
$iterator = new \FilesystemIterator($directory);