Debugging output in OStatus for easier reading+greping

[quix0rs-gnu-social.git] / plugins / Oembed / OembedPlugin.php

diff --git a/plugins/Oembed/OembedPlugin.php b/plugins/Oembed/OembedPlugin.php
index 65d71f39c8745b18b5b3fecdfc0c24bd07091cc2..56ce3cf0988a9ce548b0f6efbdc08bd09ab4eb9f 100644 (file)
--- a/plugins/Oembed/OembedPlugin.php
+++ b/plugins/Oembed/OembedPlugin.php
@@ -238,6 +238,11 @@ class OembedPlugin extends Plugin
             return true;
         }
 
+        // Show thumbnail as usual if it's a photo.
+        if ($oembed->type === 'photo') {
+            return true;
+        }
+
         $out->elementStart('article', ['class'=>'oembed-item']);
         $out->elementStart('header');
         try  {
@@ -248,7 +253,7 @@ class OembedPlugin extends Plugin
             $out->element('div', ['class'=>'error'], $e->getMessage());
         }
         $out->elementStart('h5', ['class'=>'oembed-title']);
-        $out->element('a', ['href'=>$file->getUrl()], $oembed->title);
+        $out->element('a', ['href'=>$file->getUrl()], common_strip_html($oembed->title));
         $out->elementEnd('h5');
         $out->elementStart('div', ['class'=>'oembed-source']);
         if (!empty($oembed->author_name)) {
@@ -279,7 +284,9 @@ class OembedPlugin extends Plugin
         }
         $out->elementEnd('div');
         $out->elementEnd('header');
-        $out->element('div', ['class'=>'oembed-item-body'], common_purify($oembed->html));
+        $out->elementStart('div', ['class'=>'oembed-html']);
+        $out->raw(common_purify($oembed->html));
+        $out->elementEnd('div');
         $out->elementStart('footer');
         $out->elementEnd('footer');
         $out->elementEnd('article');