From 3ea7ae0d7131f8ffcc13bfd911622439a9673afc Mon Sep 17 00:00:00 2001 From: Matthias Grief Date: Tue, 19 Nov 2024 19:52:14 +0100 Subject: [PATCH] =?UTF-8?q?Fehler=20bei=20Sortierung=20der=20Themen=20und?= =?UTF-8?q?=20F=C3=A4cher=20behoben?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webseite/classes/SubjectData.php | 9 +++++---- webseite/classes/TopicData.php | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/webseite/classes/SubjectData.php b/webseite/classes/SubjectData.php index d891011..7e2cfa0 100644 --- a/webseite/classes/SubjectData.php +++ b/webseite/classes/SubjectData.php @@ -49,6 +49,11 @@ class SubjectData $subjectDirectory = "config/subjects"; $subjectNames = scandir($subjectDirectory); + + usort($subjectNames, function ($a, $b) { + return strcmp($a, $b); + }); + foreach ($subjectNames as $subjectName) { if ($subjectName == "." || $subjectName == "..") { continue; @@ -62,10 +67,6 @@ class SubjectData $result[$subjectData->id] = $subjectData; } - usort($result, function ($a, $b) { - return strcmp($a->displayName, $b->displayName); - }); - return $result; } diff --git a/webseite/classes/TopicData.php b/webseite/classes/TopicData.php index 9213984..42b983d 100644 --- a/webseite/classes/TopicData.php +++ b/webseite/classes/TopicData.php @@ -54,6 +54,11 @@ class TopicData $topicDirectory = "config/subjects/$subjectId/topics"; $topicNames = scandir($topicDirectory); + + usort($topicNames, function ($a, $b) { + return strcmp($a, $b); + }); + foreach ($topicNames as $topicName) { if ($topicName == "." || $topicName == "..") { continue; @@ -66,10 +71,6 @@ class TopicData $result[$topicData->id] = $topicData; } - usort($result, function ($a, $b) { - return strcmp($a->displayName, $b->displayName); - }); - return $result; }