Merge pull request #12935 from HankG/fix-sending-dms-with-oauth-user

[friendica.git] / src / Content / Conversation.php

diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php
index 4dd52ebff5851ff4296ae09c4c8153955d4d4323..249190b1add67c4630aebf2aad6551cd2b5218ff 100644 (file)
--- a/src/Content/Conversation.php
+++ b/src/Content/Conversation.php
@@ -446,8 +446,6 @@ class Conversation
                $this->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
                $this->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
 
-               $ssl_state = (bool)$this->session->getLocalUserId();
-
                $live_update_div = '';
 
                $blocklist = $this->getBlocklist();
@@ -1148,8 +1146,8 @@ class Conversation
 
                        $emojis[$row['thr-parent-id']][$index]['emoji'] = $emoji;
                        $emojis[$row['thr-parent-id']][$index]['verb']  = $row['verb'];
-                       $emojis[$row['thr-parent-id']][$index]['total'] = $emojis[$row['thr-parent-id']][$emoji]['total'] ?? 0 + $row['total'];
-                       $emojis[$row['thr-parent-id']][$index]['title'] = array_unique(array_merge($emojis[$row['thr-parent-id']][$emoji]['title'] ?? [], explode($separator, $row['title'])));
+                       $emojis[$row['thr-parent-id']][$index]['total'] = ($emojis[$row['thr-parent-id']][$index]['total'] ?? 0) + $row['total'];
+                       $emojis[$row['thr-parent-id']][$index]['title'] = array_unique(array_merge($emojis[$row['thr-parent-id']][$index]['title'] ?? [], explode($separator, $row['title'])));
                }
                DBA::close($rows);