Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes

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

diff --git a/lib/noticelistitem.php b/lib/noticelistitem.php
index a10169e36df3d0df9d0c6ebcb36431e5784c3748..5468310ea3d5c70e3487cc13a95fa1488571ee70 100644 (file)
--- a/lib/noticelistitem.php
+++ b/lib/noticelistitem.php
@@ -229,8 +229,10 @@ class NoticeListItem extends Widget
             if ($this->notice->scope != 0 && $this->notice->scope != 1) {
                 $class .= ' limited-scope';
             }
-            if (!empty($this->notice->source)) {
-                $class .= ' notice-source-'.$this->notice->source;
+            try {
+                $class .= ' notice-source-'.common_to_alphanumeric($this->notice->source);
+            } catch (Exception $e) {
+                // either source or what we filtered out was a zero-length string
             }
             $id_prefix = (strlen($this->id_prefix) ? $this->id_prefix . '-' : '');
             $this->out->elementStart($this->item_tag, array('class' => $class,
@@ -249,9 +251,9 @@ class NoticeListItem extends Widget
 
     function showAuthor()
     {
-        $attrs = array('href' => $this->profile->profileurl,
+        $attrs = array('href' => $this->profile->getUrl(),
                        'class' => 'h-card',
-                       'title' => $this->profile->getNickname());
+                       'title' => $this->profile->getHtmlTitle());
         if(empty($this->repeat)) { $attrs['class'] .= ' p-author'; }
 
         if (Event::handle('StartShowNoticeItemAuthor', array($this->profile, $this->out, &$attrs))) {
@@ -284,7 +286,7 @@ class NoticeListItem extends Widget
             $this->out->elementStart('ul', 'addressees');
             $first = true;
             foreach ($pa as $addr) {
-                $this->out->elementStart('li', 'h-card');
+                $this->out->elementStart('li');
                 $text = $addr['text'];
                 unset($addr['text']);
                 $this->out->element('a', $addr, $text);
@@ -302,15 +304,15 @@ class NoticeListItem extends Widget
         $attentions = $this->getAttentionProfiles();
 
         foreach ($attentions as $attn) {
-            $class = $attn->isGroup() ? 'group' : 'account';
-            $profileurl = $attn->getUri();
-            if (common_valid_http_url($profileurl)) {
-                $class .= ' u-uid';
+            if ($attn->isGroup()) {
+                $class = 'group';
+                $profileurl = common_local_url('groupbyid', array('id' => $attn->getGroup()->getID()));
             } else {
-                $profileurl = $attn->getUrl();
+                $class = 'account';
+                $profileurl = common_local_url('userbyid', array('id' => $attn->getID()));
             }
             $this->pa[] = array('href' => $profileurl,
-                                'title' => $attn->getNickname(),
+                                'title' => $attn->getHtmlTitle(),
                                 'class' => "addressee {$class} p-name u-url",
                                 'text' => $attn->getStreamName());
         }