Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-22 20:41:39 +01:00
Code Issues Packages Projects Releases Activity

Missed few cases (deprecated methods)

Browse Source
This commit is contained in:
Matias Griese
2020-10-13 19:18:10 +03:00
parent 1ace31216f
commit c98553d19b
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -2,8 +2,8 @@
## mm/dd/2020
1. [](#new)
* Renamed `PageCollectionInterface::nonModular()` into `PageCollectionInterface::pages()` and deprecate the old method
* Renamed `PageCollectionInterface::modular()` into `PageCollectionInterface::modules()` and deprecate the old method
* Renamed `PageCollectionInterface::nonModular()` into `PageCollectionInterface::pages()` and deprecated the old method
* Renamed `PageCollectionInterface::modular()` into `PageCollectionInterface::modules()` and deprecated the old method
1. [](#bugfix)
* *Menu Visibility Requires Access* Security option setting wrong frontmatter [login#265](https://github.com/getgrav/grav-plugin-login/issues/265)
* Accessing page with unsupported file extension (jpg, pdf, xsl) will use wrong mime type [#3031](https://github.com/getgrav/grav/issues/3031)

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

@@ -631,17 +631,19 @@ class Pages
}
// Handle '@page', '@page.modular: false', '@self' and '@self.modular: false'.
if (null === $type || ($type === 'modular' && ($params[0] ?? null) === false)) {
if (null === $type || (in_array($type, ['modular', 'modules']) && ($params[0] ?? null) === false)) {
$type = 'children';
}
switch ($type) {
case 'all':
return $page->children();
case 'modules':
case 'modular':
return $page->children()->modular();
return $page->children()->modules();
case 'pages':
case 'children':
return $page->children()->nonModular();
return $page->children()->pages();
case 'page':
case 'self':
return (new Collection())->addPage($page);
@@ -653,7 +655,7 @@ class Pages
$parent = $page->parent();
return $parent ? $parent->children()->remove($page->path()) : new Collection();
case 'descendants':
return $this->all($page)->remove($page->path())->nonModular();
return $this->all($page)->remove($page->path())->pages();
default:
// Unknown type; return empty collection.
return new Collection();