Better fallback for language mismatches during page import
authorAlexander Ebert <ebert@woltlab.com>
Tue, 2 Jan 2018 12:06:25 +0000 (13:06 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 2 Jan 2018 12:06:25 +0000 (13:06 +0100)
wcfsetup/install/files/lib/system/package/plugin/PagePackageInstallationPlugin.class.php

index af113255d49617a0e22bf3335566b906ebb4ab9a..df2ba28719b24cb32907250d241fb33f203915a2 100644 (file)
@@ -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'])) {