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

Various updates primarily aimed at simplifying the check for presence of LanguageSupportPageNames module

Browse Source
This commit is contained in:
Ryan Cramer
2021-10-04 11:13:25 -04:00
parent f61feb56fd
commit 3cf1ba5cab
18 changed files with 173 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wire/core/PageTraversal.php
View File

@@ -636,7 +636,7 @@ class PageTraversal {
$options = is_array($options) ? array_merge($defaults, $options) : $defaults;
$sanitizer = $page->wire()->sanitizer;
$input = $page->wire()->input;
$modules = $page->wire()->modules;
$languages = $page->wire()->languages;
$language = null;
$url = null;
@@ -665,7 +665,7 @@ class PageTraversal {
}
}
if($options['language'] && $modules->isInstalled('LanguageSupportPageNames')) {
if($options['language'] && $languages && $languages->hasPageNames()) {
if(!is_object($options['language'])) {
$options['language'] = null;
} else if(!$options['language'] instanceof Page) {
@@ -699,10 +699,8 @@ class PageTraversal {
}
if((int) $options['pageNum'] > 1) {
$prefix = '';
if($language) {
/** @var LanguageSupportPageNames $lsp */
$lsp = $modules->get('LanguageSupportPageNames');
$prefix = $lsp ? $lsp->get("pageNumUrlPrefix$language") : '';
if($language && $languages && $languages->hasPageNames()) {
$prefix = $languages->pageNames()->get("pageNumUrlPrefix$language");
}
if(!strlen($prefix)) $prefix = $config->pageNumUrlPrefix;
$url = rtrim($url, '/') . '/' . $prefix . ((int) $options['pageNum']);
@@ -788,7 +786,7 @@ class PageTraversal {
}
// include other language URLs
if($languages && $modules->isInstalled('LanguageSupportPageNames')) {
if($languages && $languages->hasPageNames()) {
foreach($languages as $language) {
if(!$language->isDefault() && !$page->get("status$language")) continue;
$urls[$language->name] = $page->localUrl($language);