mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-16 03:34:33 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#941

Browse Source
This commit is contained in:
Ryan Cramer
2020-07-31 09:32:04 -04:00
parent 4cc8e56e9d
commit abc9cd8adc
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wire/modules/PagePathHistory.module
View File

@@ -390,11 +390,18 @@ class PagePathHistory extends WireData implements Module, ConfigurableModule {
} }
// if historical parent path differs from page’s current parent path, include it // if historical parent path differs from page’s current parent path, include it
if($parentPath !== '/' && $parentPath != $page->parent()->path()) { if($parentPath === '' || $parentPath === '/') {
$parent = $this->wire('pages')->get("/$parentPath"); // historial parent is root/home
} else if($parentPath === trim($page->parent()->path(), '/')) {
// historial parent is the same as current parent
} else if($parentPath === trim($page->path(), '/')) {
// historial parent is the page itself
} else {
// historial parent may be one we want to check
$parent = $this->wire()->pages->get("/$parentPath");
if(!$parent->id) $parent = $this->getPage($parentPath); if(!$parent->id) $parent = $this->getPage($parentPath);
// if parent from path is different from current page parent, include in our list of parents to check // if parent from path is different from current page parent, include in our list of parents to check
if($parent->id > 1 && $parent->id != $page->parent_id) { if($parent->id > 1 && $parent->id != $page->parent_id && $parent->id != $page->id) {
$checkParents[] = $parent; $checkParents[] = $parent;
} }
} }
@@ -506,8 +513,9 @@ class PagePathHistory extends WireData implements Module, ConfigurableModule {
// note that the paths we store have no trailing slash // note that the paths we store have no trailing slash
if($languages) { if($languages) {
$parent = $page->parent();
$parentPrevious = $page->parentPrevious; $parentPrevious = $page->parentPrevious;
if($parentPrevious && $parentPrevious->id == $page->parent()->id) $parentPrevious = null; if($parentPrevious && $parentPrevious->id == $parent->id) $parentPrevious = null;
foreach($languages as $language) { foreach($languages as $language) {
/** @var Language $language */ /** @var Language $language */
if($language->isDefault()) continue; if($language->isDefault()) continue;