Normalize item body template variable name

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 8fd9725aae8467434e58441b5d1098ef2af9a65f..fd7303fa46f4d97090c539ea0df68d6eca2306f4 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -546,8 +546,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 
                                $locate = ['location' => $item['location'], 'coord' => $item['coord'], 'html' => ''];
                                Hook::callAll('render_location',$locate);
-
-                               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
+                               $location_html = $locate['html'] ?: Strings::escapeHtml($locate['location'] ?: $locate['coord'] ?: '');
 
                                localize_item($item);
                                if ($mode === 'network-new') {
@@ -577,7 +576,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        unset($likebuttons['dislike']);
                                }
 
-                               $body = Item::prepareBody($item, true, $preview);
+                               $body_html = Item::prepareBody($item, true, $preview);
 
                                list($categories, $folders) = DI::contentItem()->determineCategoriesTerms($item);
 
@@ -602,7 +601,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'lock' => $lock,
                                        'thumb' => DI::baseUrl()->remove($item['author-avatar']),
                                        'title' => $title,
-                                       'body' => $body,
+                                       'body_html' => $body_html,
                                        'tags' => $tags['tags'],
                                        'hashtags' => $tags['hashtags'],
                                        'mentions' => $tags['mentions'],
@@ -613,10 +612,10 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'has_folders' => ((count($folders)) ? 'true' : ''),
                                        'categories' => $categories,
                                        'folders' => $folders,
-                                       'text' => strip_tags($body),
+                                       'text' => strip_tags($body_html),
                                        'localtime' => DateTimeFormat::local($item['created'], 'r'),
                                        'ago' => (($item['app']) ? DI::l10n()->t('%s from %s', Temporal::getRelativeDate($item['created']),$item['app']) : Temporal::getRelativeDate($item['created'])),
-                                       'location' => $location,
+                                       'location_html' => $location_html,
                                        'indent' => '',
                                        'owner_name' => $owner_name,
                                        'owner_url' => $owner_url,
@@ -741,32 +740,39 @@ function conversation_fetch_comments($thread_items, $pinned) {
                        $direction = ['direction' => 5, 'title' => DI::l10n()->t('%s commented on this.', $row['author-name'])];
                }
 
-               if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id'])) {
-                       if (Contact::isSharing($row['author-id'], $row['uid'])) {
+               switch ($row['post-type']) {
+                       case Item::PT_TO:
+                               $row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'to')];
+                               break;
+                       case Item::PT_CC:
+                               $row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'cc')];
+                               break;
+                       case Item::PT_BTO:
+                               $row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'bto')];
+                               break;
+                       case Item::PT_BCC:
+                               $row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'bcc')];
+                               break;
+                       case Item::PT_FOLLOWER:
                                $row['direction'] = ['direction' => 6, 'title' => DI::l10n()->t('You are following %s.', $row['author-name'])];
-                       } else {
-                               if ($row['post-type'] == Item::PT_TAG) {
-                                       $row['direction'] = ['direction' => 4, 'title' => DI::l10n()->t('Tagged')];
-                               }
-                               $parentlines[] = $lineno;
-                       }
+                               break;
+                       case Item::PT_TAG:
+                               $row['direction'] = ['direction' => 4, 'title' => DI::l10n()->t('Tagged')];
+                               break;
+                       case Item::PT_ANNOUNCEMENT:
+                               $row['direction'] = ['direction' => 3, 'title' => DI::l10n()->t('Reshared')];
+                               break;
+                       case Item::PT_COMMENT:
+                               $row['direction'] = ['direction' => 5, 'title' => DI::l10n()->t('%s is participating in this thread.', $row['author-name'])];
+                               break;
+                       case Item::PT_STORED:
+                               $row['direction'] = ['direction' => 8, 'title' => DI::l10n()->t('Stored')];
+                               break;
+               }
 
-                       switch ($row['post-type']) {
-                               case Item::PT_TO:
-                                       $row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'to')];
-                                       break;
-                               case Item::PT_CC:
-                                       $row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'cc')];
-                                       break;
-                               case Item::PT_BTO:
-                                       $row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'bto')];
-                                       break;
-                               case Item::PT_BCC:
-                                       $row['direction'] = ['direction' => 7, 'title' => DI::l10n()->t('You had been addressed (%s).', 'bcc')];
-                                       break;
-                               case Item::PT_FOLLOWER:
-                                       $row['direction'] = ['direction' => 6, 'title' => DI::l10n()->t('You are following %s.', $row['author-name'])];
-                       }
+               if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id']) &&
+                       !Contact::isSharing($row['author-id'], $row['uid'])) {
+                       $parentlines[] = $lineno;
                }
 
                if ($row['gravity'] == GRAVITY_PARENT) {
@@ -1490,13 +1496,3 @@ function sort_thr_commented(array $a, array $b)
 {
        return strcmp($b['commented'], $a['commented']);
 }
-
-function render_location_dummy(array $item) {
-       if (!empty($item['location']) && !empty($item['location'])) {
-               return $item['location'];
-       }
-
-       if (!empty($item['coord']) && !empty($item['coord'])) {
-               return $item['coord'];
-       }
-}