Merge commit 'refs/merge-requests/30' of https://gitorious.org/social/mainline into...

Signed-off-by: Roland Haeder <roland@mxchange.org>

diff --combined plugins/Bookmark/BookmarkPlugin.php
index 2a98c5ebafe927ec24d7587c16651b6b2dd00a37,2426deb93f5658dc538dcacab602b5f17316f766..a3dc196e78eabe513c4e727f45acc2b9c9721aa6
--- 1/plugins/Bookmark/BookmarkPlugin.php
--- 2/plugins/Bookmark/BookmarkPlugin.php
+++ b/plugins/Bookmark/BookmarkPlugin.php
@@@ -181,7 -181,7 +181,7 @@@ class BookmarkPlugin extends MicroAppPl
       *
       * @return value
       */
 -    function onPluginVersion(&$versions)
 +    function onPluginVersion(array &$versions)
      {
          $versions[] = array('name' => 'Bookmark',
                              'version' => self::VERSION,
@@@ -536,6 -536,12 +536,12 @@@
          $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 +575,5 @@@
              $out->elementEnd('ul');
          }
  
-         if (!empty($nb->description)) {
-             $out->element('p',
-                           array('class' => 'bookmark-description'),
-                           $nb->description);
-         }
      }
  }