Merge branch 'main' into issue-3911issue-3911

4 files changed, 8 insertions, 7 deletions

diff --git a/app/views/course/forum/area/add.php b/app/views/course/forum/area/add.php
index 881c122..1449a5d 100644
--- a/app/views/course/forum/area/add.php
+++ b/app/views/course/forum/area/add.php
@@ -7,7 +7,7 @@
         <? else : ?>
             <? $num_postings = ForumVisit::getCount($entry['topic_id'], $visitdate) ?>
             <?= Icon::create('forum', $num_postings > 0 ? Icon::ROLE_ATTENTION : Icon::ROLE_INFO)->asImg([
-                'title' => ForumHelpers::getVisitText($num_postings, $entry['topic_id'], $constraint['depth']),
+                'title' => ForumHelpers::getVisitText($num_postings, $entry['topic_id']),
             ]) ?>
         <? endif ?>
     </td>
@@ -36,7 +36,7 @@
     </td>
 
     <td class="postings">
-        <?= number_format(max($entry['num_postings'] - 1, 0), 0, ',', '.') ?>
+        <?= number_format(max(($entry['num_postings'] ?? 0) - 1, 0), 0, ',', '.') ?>
     </td>
 
     <td class="answer hidden-tiny-down">
diff --git a/app/views/course/forum/index/_areas.php b/app/views/course/forum/index/_areas.php
index 11f32be..4f4fa0f 100644
--- a/app/views/course/forum/index/_areas.php
+++ b/app/views/course/forum/index/_areas.php
@@ -46,17 +46,18 @@
         <col>
         <col>
         <col class="hidden-tiny-down">
-        <col>
+        <col style="width: 20px">
     </colgroup>
 
     <thead>
         <tr>
-            <th colspan="2"> <?= _('Name des Bereichs') ?></th>
+            <th></th>
+            <th> <?= _('Name des Bereichs') ?></th>
             <th data-type="answers"><?= _("Beiträge") ?></th>
             <th data-type="last_posting" class="hidden-tiny-down">
                 <?= _("letzte Antwort") ?>
             </th>
-            <th></th>
+            <th> <?= _('Aktionen') ?> </th>
         </tr>
     </thead>
 
diff --git a/app/views/course/forum/index/_last_post.php b/app/views/course/forum/index/_last_post.php
index 3532d40..b5d854a 100644
--- a/app/views/course/forum/index/_last_post.php
+++ b/app/views/course/forum/index/_last_post.php
@@ -1,4 +1,4 @@
-<? if (is_array($entry['last_posting']) && count($entry['last_posting'])) : ?>
+<? if (!empty($entry['last_posting']) && is_array($entry['last_posting'])) : ?>
     <?= _('von') ?>
     <? if (!empty($entry['last_posting']['anonymous'])): ?>
         <?= _('Anonym') ?>
diff --git a/app/views/course/forum/index/_post.php b/app/views/course/forum/index/_post.php
index 7b6aaa0..192a414 100644
--- a/app/views/course/forum/index/_post.php
+++ b/app/views/course/forum/index/_post.php
@@ -91,7 +91,7 @@
 
             <span data-show-topic="<?= $post['topic_id'] ?>" data-topic-content="<?= $post['topic_id'] ?>" <?= $edit_posting != $post['topic_id'] ? '' : 'style="display: none;"' ?>>
                 <?= ForumHelpers::highlight($post['content'], $highlight) ?>
-                <?= OpenGraph::extract(formatReady(ForumEntry::removeQuotes($post['content_raw'])))->render() ?>
+                <?= OpenGraph::extract(ForumEntry::removeQuotes($post['content_raw']))->render() ?>
             </span>
         </div>