Skip to content

Fix file sorting e.g. for gallery #1543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zonky2 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix file sorting e.g. for gallery #1543

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Helper/ToolboxFile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* This file is part of MetaModels/core.
*
* (c) 2012-2025 The MetaModels team.
* (c) 2012-2026 The MetaModels team.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
Expand All @@ -20,7 +20,7 @@
* @author Ingolf Steinhardt <info@e-spin.de>
* @author Sven Baumann <baumann.sv@gmail.com>
* @author Andreas Fischer <anfischer@kaffee-partner.de>
* @copyright 2012-2025 The MetaModels team.
* @copyright 2012-2026 The MetaModels team.
* @license https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0-or-later
* @filesource
*/
Expand Down Expand Up @@ -802,6 +802,10 @@
$fileKeys = array_flip(array_keys($this->uuidMap));
$sorted = [];
foreach ($sortIds as $sortStringId) {
if (!isset($fileKeys[$sortStringId])) {
continue;
}

$key = $fileKeys[$sortStringId];
$sorted[$key] = $fileMap[$key];
unset($fileMap[$key]);
Expand Down Expand Up @@ -1107,7 +1111,7 @@

if (isset($meta[$baseLanguage])) {
$this->metaInformation[dirname($path)][basename($path)] = $meta[$baseLanguage];
} elseif (isset($meta[$fallbackLanguage]) && null !== $fallbackLanguage) {

Check failure on line 1114 in src/Helper/ToolboxFile.php

View workflow job for this annotation

GitHub Actions / PHP: 8.3 Contao: ~5.3.0 

PossiblyNullArrayOffset: Cannot access value on variable $meta using possibly null offset null|string (reported by psalm)

Check failure on line 1114 in src/Helper/ToolboxFile.php

View workflow job for this annotation

GitHub Actions / PHP: 8.2 Contao: ~5.3.0 

PossiblyNullArrayOffset: Cannot access value on variable $meta using possibly null offset null|string (reported by psalm)

Check failure on line 1114 in src/Helper/ToolboxFile.php

View workflow job for this annotation

GitHub Actions / PHP: 8.2 Contao: ~5.3.0 

PossiblyNullArrayOffset: Cannot access value on variable $meta using possibly null offset null|string (reported by psalm)

Check failure on line 1114 in src/Helper/ToolboxFile.php

View workflow job for this annotation

GitHub Actions / PHP: 8.3 Contao: ~5.3.0 

PossiblyNullArrayOffset: Cannot access value on variable $meta using possibly null offset null|string (reported by psalm)
$this->metaInformation[dirname($path)][basename($path)] = $meta[$fallbackLanguage];
}
}
Expand Down
Loading