Merge pull request #4701 from tobiasd/20180328-msg

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index ecd2e4df9ef09ad20dbb69fb3370c19731ecd41a..c473d011bed138ff10c20ea1e8c51d1ea6cacfc6 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -21,8 +21,6 @@ use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
-require_once "include/acl_selectors.php";
-
 function item_extract_images($body) {
 
        $saved_image = [];
@@ -445,7 +443,7 @@ These Fields are not added below (yet). They are here to for bug search.
        return "`item`.`author-id`, `item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
                `item`.`owner-id`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
                `item`.`contact-id`, `item`.`uid`, `item`.`id`, `item`.`parent`,
-               `item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`,
+               `item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`, `item`.`content-warning`,
                `item`.`commented`, `item`.`created`, `item`.`edited`, `item`.`received`,
                `item`.`verb`, `item`.`object-type`, `item`.`postopts`, `item`.`plink`,
                `item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`,
@@ -1645,7 +1643,7 @@ function get_responses($conv_responses, $response_verbs, $ob, $item) {
        foreach ($response_verbs as $v) {
                $ret[$v] = [];
                $ret[$v]['count'] = defaults($conv_responses[$v], $item['uri'], '');
-               $ret[$v]['list']  = defaults($conv_responses[$v], $item['uri'] . '-l', '');
+               $ret[$v]['list']  = defaults($conv_responses[$v], $item['uri'] . '-l', []);
                $ret[$v]['self']  = defaults($conv_responses[$v], $item['uri'] . '-self', '0');
                if (count($ret[$v]['list']) > MAX_LIKERS) {
                        $ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS);