Merge branch 'correct-author-for-repeat' into 'master'

Markup correct author for a repeat

The original author is not the author of this entry, but of the original entry.

See merge request !51

diff --git a/lib/noticelistitem.php b/lib/noticelistitem.php
index dc171409f41e8042040c38a174a242d3c0c9f3cd..7701cd8a6c05769c7513aeacee61595645a46eb1 100644 (file)
--- a/lib/noticelistitem.php
+++ b/lib/noticelistitem.php
@@ -235,8 +235,9 @@ class NoticeListItem extends Widget
     function showAuthor()
     {
         $attrs = array('href' => $this->profile->profileurl,
-                       'class' => 'h-card p-author',
+                       'class' => 'h-card',
                        'title' => $this->profile->getNickname());
+        if(empty($this->repeat)) { $attrs['class'] .= ' p-author'; }
 
         if (Event::handle('StartShowNoticeItemAuthor', array($this->profile, $this->out, &$attrs))) {
             $this->out->elementStart('a', $attrs);

diff --git a/plugins/Share/SharePlugin.php b/plugins/Share/SharePlugin.php
index c337efbaeca10660b02376212f006df46cee722e..c31686e4451b5556c2488ce24c7dbe41b4d812a0 100644 (file)
--- a/plugins/Share/SharePlugin.php
+++ b/plugins/Share/SharePlugin.php
@@ -204,7 +204,7 @@ class SharePlugin extends ActivityVerbHandlerPlugin
                            'class' => 'h-card p-author',
                            'title' => $repeater->getFancyName());
 
-            $nli->out->elementStart('span', 'repeat h-entry');
+            $nli->out->elementStart('span', 'repeat');
 
             // TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
             $nli->out->raw(_('Repeated by').' ');