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

Fixed PageObject::getRoute() with pages which have no route

Browse Source
This commit is contained in:
Matias Griese 2021-01-14 20:49:37 +02:00
parent fdfcaaeb39
commit 57c6414d1c
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,7 @@
## mm/dd/2020
1. [](#new)
* Please read [Grav 1.7 Upgrade Guide](https://learn.getgrav.org/17/advanced/grav-development/grav-17-upgrade-guide) before upgrading!
* Added support for overriding configuration by using environment variables
* Use PHP 7.4 serialization (the old `Serializable` methods are now final and cannot be overridden)
* Enabled `ETag` setting by default for 304 responses
@ -24,6 +25,7 @@
* Fixed fatal error in PHP 8 when trying to access root page
* Fixed Array->String conversion error when `languages:translations: false` [admin#1896](https://github.com/getgrav/grav-plugin-admin/issues/1896)
* Fixed `Inflector` methods when translation is missing `GRAV.INFLECTOR_*` translations
* Fixed `PageObject::getRoute()` with pages which have no route
# v1.7.0-rc.20
## 12/15/2020

11
system/src/Grav/Common/Flex/Types/Pages/PageObject.php
View File

@ -96,11 +96,16 @@ class PageObject extends FlexPageObject
/**
* @param string|array $query
* @return Route
* @return Route|null
*/
public function getRoute($query = []): Route
public function getRoute($query = []): ?Route
{
$route = RouteFactory::createFromString($this->route());
$route = $this->route();
if (null === $route) {
return null;
}
$route = RouteFactory::createFromString($route);
if ($lang = $route->getLanguage()) {
$grav = Grav::instance();
if (!$grav['config']->get('system.languages.include_default_lang')) {