Misses this file to merge. I like the comments.

[quix0rs-gnu-social.git] / lib / microappplugin.php

diff --git a/lib/microappplugin.php b/lib/microappplugin.php
index e034bb9b31fbbd37530dcd0d2d137b26f44969a9..53fe5e9995eab4d7bf467c7015d769c8122dbd04 100644 (file)
--- a/lib/microappplugin.php
+++ b/lib/microappplugin.php
@@ -97,16 +97,14 @@ abstract class MicroAppPlugin extends ActivityHandlerPlugin
             return true;
         }
 
-        $adapter = $this->adaptNoticeListItem($nli);
-
-        if (empty($adapter)) {
-            throw new ServerException('Could not adapt NoticeListItem');
-        }
+        // Legacy use was creating a "NoticeListItemAdapter", but
+        // nowadays we solve that using event handling for microapps.
+        // This section will remain until all plugins are fixed.
+        $adapter = $this->adaptNoticeListItem($nli) ?: $nli;
 
         $adapter->showNotice();
         $adapter->showNoticeAttachments();
-        $adapter->showNoticeInfo();
-        $adapter->showNoticeOptions();
+        $adapter->showNoticeFooter();
 
         return false;
     }