mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-13 02:04:35 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#1652

Browse Source
This commit is contained in:
Ryan Cramer
2022-12-09 13:16:04 -05:00
parent a3cc73bd87
commit adcee84904
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wire/modules/PagePaths.module
View File

@@ -446,6 +446,7 @@ class PagePaths extends WireData implements Module, ConfigurableModule {
if($languages) { if($languages) {
// multi-language // multi-language
foreach($languages as $language) { foreach($languages as $language) {
/** @var Language $language */
$languageId = $language->isDefault() ? 0 : $language->id; $languageId = $language->isDefault() ? 0 : $language->id;
$paths[$languageId] = $page->localPath($language); $paths[$languageId] = $page->localPath($language);
if($pageId === 1 && !$languageId) $homeDefaultName = $page->name; if($pageId === 1 && !$languageId) $homeDefaultName = $page->name;
@@ -523,6 +524,7 @@ class PagePaths extends WireData implements Module, ConfigurableModule {
if($languages) { if($languages) {
foreach($languages as $language) { foreach($languages as $language) {
/** @var Language $language */
if($language->isDefault()) continue; if($language->isDefault()) continue;
$nameColumns[] = "pages.name$language->id AS name$language->id"; $nameColumns[] = "pages.name$language->id AS name$language->id";
} }
@@ -635,7 +637,7 @@ class PagePaths extends WireData implements Module, ConfigurableModule {
$id = (int) $row['id']; $id = (int) $row['id'];
unset($row['id']); unset($row['id']);
foreach($row as $col => $name) { foreach($row as $col => $name) {
if(!strlen($name)) continue; if(!strlen("$name")) continue;
if($id === 1 && $col === 'name' && $name === Pages::defaultRootName) continue; // skip "/home/" if($id === 1 && $col === 'name' && $name === Pages::defaultRootName) continue; // skip "/home/"
$col = str_replace('name', '', $col); $col = str_replace('name', '', $col);
if(strlen($col)) { if(strlen($col)) {
@@ -709,7 +711,7 @@ class PagePaths extends WireData implements Module, ConfigurableModule {
* @param \PDOStatement $query * @param \PDOStatement $query
* @param bool $throw Allow exceptions to be thrown? (default=true) * @param bool $throw Allow exceptions to be thrown? (default=true)
* @return bool * @return bool
* @throws \PDOException|WireException * @throws \PDOException
* *
*/ */
protected function executeQuery($query, $throw = true) { protected function executeQuery($query, $throw = true) {