Post verb default type is 'note'

[quix0rs-gnu-social.git] / plugins / Bookmark / BookmarkPlugin.php

diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php
index 9ea83c4caf1f2263f43ff3952b5e550093b585fc..547efa2370104187891241cfbd7ba90d7ad689c8 100644 (file)
--- a/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@ -181,7 +181,7 @@ class BookmarkPlugin extends MicroAppPlugin
      *
      * @return value
      */
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Bookmark',
                             'version' => self::VERSION,
@@ -409,7 +409,7 @@ class BookmarkPlugin extends MicroAppPlugin
         $target = $attachments[0];
 
         $attrs = array('rel' => 'related',
-                       'href' => $target->url);
+                       'href' => $target->getUrl());
 
         if (!empty($target->title)) {
             $attrs['title'] = $target->title;
@@ -422,7 +422,7 @@ class BookmarkPlugin extends MicroAppPlugin
         try {
             $thumbnail = $target->getThumbnail();
             $tattrs = array('rel' => 'preview',
-                            'href' => $thumbnail->url);
+                            'href' => $thumbnail->getUrl());
 
             if (!empty($thumbnail->width)) {
                 $tattrs['media:width'] = $thumbnail->width;
@@ -536,6 +536,12 @@ class BookmarkPlugin extends MicroAppPlugin
         $replies = $stored->getReplies();
         $tags = $stored->getTags();
 
+        if (!empty($nb->description)) {
+            $out->element('p',
+                          array('class' => 'bookmark-description'),
+                          $nb->description);
+        }
+
         if (!empty($replies) || !empty($tags)) {
 
             $out->elementStart('ul', array('class' => 'bookmark-tags'));
@@ -569,10 +575,5 @@ class BookmarkPlugin extends MicroAppPlugin
             $out->elementEnd('ul');
         }
 
-        if (!empty($nb->description)) {
-            $out->element('p',
-                          array('class' => 'bookmark-description'),
-                          $nb->description);
-        }
     }
 }