From 9f5e1594384d97300e1f18b3ea131ec15f9b0cf8 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Tue, 2 Jan 2018 13:06:25 +0100 Subject: [PATCH] Better fallback for language mismatches during page import --- .../package/plugin/PagePackageInstallationPlugin.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php index af113255d4..df2ba28719 100644 --- a/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php @@ -116,10 +116,14 @@ class PagePackageInstallationPlugin extends AbstractXMLPackageInstallationPlugin // use the value for English $name = $data['elements']['name']['en']; } - else { + else if (isset($data['elements']['name'][''])) { // fallback to the display name without/empty language attribute $name = $data['elements']['name']['']; } + else { + // use whichever value is present, regardless of the language + $name = reset($data['elements']['name']); + } $parentPageID = null; if (!empty($data['elements']['parent'])) { -- 2.20.1