fix: school accordion text not formatted (#719)

helsingborg-stad · Oct 23, 2023 · a2cc7c9 · a2cc7c9
1 parent 8aeac8a
commit a2cc7c9
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/library/Controller/ContentType/School/SchoolDataPreparer.php b/library/Controller/ContentType/School/SchoolDataPreparer.php
@@ -292,21 +292,17 @@ private function appendViewAccordionData(): void
         $information = $this->postMeta->information;
 
         if (isset($information->how_we_work) && !empty($information->how_we_work)) {
-            $accordions[] = ['list' => [
-                [
-                    'heading' => __('About the school', 'municipio'),
-                    'content' => $information->about_us
-                ]
-            ]];
+            $accordions[] = ['list' => [$this->getAccordionListItem(
+                __('About the school', 'municipio'),
+                $information->about_us
+            )]];
         }
 
         if (isset($information->how_we_work) && !empty($information->how_we_work)) {
-            $accordions[] = ['list' => [
-                [
-                    'heading' => __('How we work', 'municipio'),
-                    'content' => $information->how_we_work
-                ]
-            ]];
+            $accordions[] = ['list' => [$this->getAccordionListItem(
+                __('How we work', 'municipio'),
+                $information->how_we_work
+            )]];
         }
 
         if (isset($information->optional) && !empty($information->optional)) {
@@ -316,18 +312,23 @@ private function appendViewAccordionData(): void
                     continue;
                 }
 
-                $accordions[] = ['list' => [
-                    [
-                        'heading' => $optional->heading ?? '',
-                        'content' => $optional->content ?? ''
-                    ]
-                ]];
+                $accordions[] = ['list' => [$this->getAccordionListItem(
+                    $optional->heading,
+                    $optional->content
+                )]];
             }
         }
 
         $this->data['accordions'] = $accordions;
     }
 
+    private function getAccordionListItem(?string $heading, ?string $text):array {
+        return [
+            'heading' => $heading ?? '',
+            'content' => wpautop($text ?? '')
+        ];
+    }
+
     private function appendViewVisitingData(): void
     {
         $visitingAddresses = $this->postMeta->visitingAddress;