From adcee849049496da7bfba735f43cc52789355d58 Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Fri, 9 Dec 2022 13:16:04 -0500 Subject: [PATCH] Fix issue processwire/processwire-issues#1652 --- wire/modules/PagePaths.module | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wire/modules/PagePaths.module b/wire/modules/PagePaths.module index b063f4a5..78a781a3 100644 --- a/wire/modules/PagePaths.module +++ b/wire/modules/PagePaths.module @@ -446,6 +446,7 @@ class PagePaths extends WireData implements Module, ConfigurableModule { if($languages) { // multi-language foreach($languages as $language) { + /** @var Language $language */ $languageId = $language->isDefault() ? 0 : $language->id; $paths[$languageId] = $page->localPath($language); if($pageId === 1 && !$languageId) $homeDefaultName = $page->name; @@ -523,6 +524,7 @@ class PagePaths extends WireData implements Module, ConfigurableModule { if($languages) { foreach($languages as $language) { + /** @var Language $language */ if($language->isDefault()) continue; $nameColumns[] = "pages.name$language->id AS name$language->id"; } @@ -635,7 +637,7 @@ class PagePaths extends WireData implements Module, ConfigurableModule { $id = (int) $row['id']; unset($row['id']); foreach($row as $col => $name) { - if(!strlen($name)) continue; + if(!strlen("$name")) continue; if($id === 1 && $col === 'name' && $name === Pages::defaultRootName) continue; // skip "/home/" $col = str_replace('name', '', $col); if(strlen($col)) { @@ -709,7 +711,7 @@ class PagePaths extends WireData implements Module, ConfigurableModule { * @param \PDOStatement $query * @param bool $throw Allow exceptions to be thrown? (default=true) * @return bool - * @throws \PDOException|WireException + * @throws \PDOException * */ protected function executeQuery($query, $throw = true) {