From 5c2923869ac02e2bb39074640c37264504434912 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Sun, 11 Oct 2015 20:00:54 +0200
Subject: [PATCH] this got lost by merge
---
include/conversation.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/conversation.php b/include/conversation.php
index 7417dbf81..0907b5dce 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -987,7 +987,7 @@ function builtin_activity_puller($item, &$conv_responses) {
else
$url = zrl($url);
- $url = '' . $item['author-name'] . '';
+ $url = '' . htmlentities($item['author-name']) . '';
if(! $item['thr-parent'])
$item['thr-parent'] = $item['parent-uri'];