aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/conversation.php11
-rw-r--r--version.inc2
2 files changed, 10 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 05ae72d61..a4d94f946 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -989,7 +989,11 @@ function like_puller($a,$item,&$arr,$mode) {
$verb = (($mode === 'like') ? ACTIVITY_LIKE : ACTIVITY_DISLIKE);
if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
- $url = chanlink_url($item['author']['xchan_url']);
+
+ if($item['author']['xchan_url'])
+ $url = chanlink_url($item['author']['xchan_url']);
+ else
+ $url = z_root();
if(! $item['thr_parent'])
$item['thr_parent'] = $item['parent_mid'];
@@ -1000,7 +1004,10 @@ function like_puller($a,$item,&$arr,$mode) {
$arr[$item['thr_parent']] = 1;
else
$arr[$item['thr_parent']] ++;
- $arr[$item['thr_parent'] . '-l'][] = '<a href="'. $url . '">' . $item['author']['xchan_name'] . '</a>';
+
+ $name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown'));
+
+ $arr[$item['thr_parent'] . '-l'][] = '<a href="'. $url . '">' . $name . '</a>';
}
return;
}
diff --git a/version.inc b/version.inc
index 61b92795e..5a8480353 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-09-19.803
+2014-09-20.804