Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-06 06:27:51 +02:00
Code Issues Packages Projects Releases Activity

Revert chReverted setting language for every page during initialization

Browse Source
This commit is contained in:
Matias Griese
2019-10-03 19:17:22 +03:00
parent ffa9ef6a7e
commit 15f1f2a03d
4 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -8,6 +8,7 @@
1. [](#bugfix)
* Fixed wrong Grav param separator when using `Route` class
* Grav 1.7: Fixed prev/next page missing pages if pagination was turned on in page header
* Grav 1.7: Reverted setting language for every page during initialization
# v1.7.0-beta.9
## 09/26/2019

2
system/src/Grav/Common/Page/Interfaces/PageRoutableInterface.php
View File

@@ -153,7 +153,7 @@ interface PageRoutableInterface
/**
* Returns the item in the current position.
*
* @return int the index of the current page.
* @return int|null The index of the current page.
*/
public function currentPosition();

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

@@ -128,10 +128,7 @@ class Page implements PageInterface
*/
public function init(\SplFileInfo $file, $extension = null)
{
$grav = Grav::instance();
/** @var Config $config */
$config = $grav['config'];
$config = Grav::instance()['config'];
// some extension logic
if (empty($extension)) {
@@ -141,13 +138,8 @@ class Page implements PageInterface
}
// extract page language from page extension
$languageCode = trim(basename($this->extension(), 'md'), '.') ?: null;
if (!$languageCode) {
/** @var Language $language */
$language = $grav['language'];
$languageCode = $language->enabled() ? $language->getDefault() : null;
}
$this->language($languageCode);
$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'));
@@ -2422,7 +2414,7 @@ class Page implements PageInterface
/**
* Returns the item in the current position.
*
* @return int the index of the current page.
* @return int|null The index of the current page.
*/
public function currentPosition()
{

6
system/src/Grav/Console/Cli/PageSystemValidatorCommand.php
View File

@@ -76,9 +76,9 @@ class PageSystemValidatorCommand extends ConsoleCommand
'root' => [[]],
// Translations
//'translatedLanguages' => [[], [false], [true]],
//'untranslatedLanguages' => [[], [false], [true]],
//'language' => [[]],
'translatedLanguages' => [[], [false], [true]],
'untranslatedLanguages' => [[], [false], [true]],
'language' => [[]],
// Legacy
'raw' => [[]],