mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-28 17:10:04 +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

9
wire/core/PagesTrash.php
View File

@@ -75,8 +75,8 @@ class PagesTrash extends Wire {
$page->name = ($name . "_" . $page->name);
// do the same for other languages, if present
$languages = $this->wire('languages');
if($languages && $this->wire('modules')->isInstalled('LanguageSupportPageNames')) {
$languages = $this->wire()->languages;
if($languages && $languages->hasPageNames()) {
foreach($languages as $language) {
if($language->isDefault()) continue;
$langName = $page->get("name$language->id");
@@ -153,9 +153,8 @@ class PagesTrash extends Wire {
'namePrevious' => '',
);
/** @var Languages|array $languages */
$languages = $this->wire('languages');
if(!$languages || !$this->wire('modules')->isInstalled('LanguageSupportPageNames')) $languages = array();
$languages = $this->wire()->languages;
if(!$languages || !$languages->hasPageNames()) $languages = array();
// initialize name properties in $info for each language
foreach($languages as $language) {