Merge pull request #9989 from annando/issue-9912

Issue 9912: Process Markdown content from Peertube

diff --combined src/Model/Item.php
index 002d4bd,7c859ed..6d55fd5
--- 1/src/Model/Item.php
--- 2/src/Model/Item.php
+++ b/src/Model/Item.php
@@@ -94,9 -94,9 +94,9 @@@ class Ite
                        'private', 'title', 'body', 'raw-body', 'location', 'coord', 'app',
                        'inform', 'deleted', 'extid', 'post-type', 'gravity',
                        'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
 -                      'author-id', 'author-link', 'owner-id', 'owner-link', 'contact-uid',
 +                      'author-id', 'author-link', 'author-name', 'author-avatar', 'owner-id', 'owner-link', 'contact-uid',
                        'signed_text', 'network', 'wall', 'contact-id', 'plink', 'forum_mode', 'origin',
 -                      'thr-parent-id', 'parent-uri-id', 'postopts', 'pubmail', 
 +                      'thr-parent-id', 'parent-uri-id', 'postopts', 'pubmail',
                        'event-created', 'event-edited', 'event-start', 'event-finish',
                        'event-summary', 'event-desc', 'event-location', 'event-type',
                        'event-nofinish', 'event-adjust', 'event-ignore', 'event-id'];
@@@ -1503,6 -1503,10 +1503,10 @@@
         */
        private static function getLanguage(array $item)
        {
+               if (!empty($item['language'])) {
+                       return $item['language'];
+               }
+ 
                if (!in_array($item['gravity'], [GRAVITY_PARENT, GRAVITY_COMMENT]) || empty($item['body'])) {
                        return '';
                }