Merge pull request #1947 from annando/1510-diaspora-follower

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index bbb0b921a344051b4668dfe1beac007a51a6a7f6..83b5741fe1147c9eef0595c179ea4f8fb7fba926 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -897,7 +897,8 @@ function item_photo_menu($item){
        if ($a->contacts[$clean_url]['network'] === NETWORK_DFRN)
                $menu[t("Poke")] = $poke_link;
 
-       if (($cid == 0) AND in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
+       if (($cid == 0) AND
+               in_array($item['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
                $menu[t("Connect/Follow")] = $a->get_baseurl($ssl_state)."/follow?url=".urlencode($item['author-link']);
 
        $args = array('item' => $item, 'menu' => $menu);
@@ -942,7 +943,7 @@ 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 . '"'. $sparkle .'>' . $item['author-name'] . '</a>';
+               $arr[$item['thr-parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . htmlentities($item['author-name']) . '</a>';
        }
        return;
 }}
@@ -958,7 +959,7 @@ if(! function_exists('format_like')) {
 function format_like($cnt,$arr,$type,$id) {
        $o = '';
        if($cnt == 1)
-               $o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
+               $o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL;
        else {
                $spanatts = "class=\"fakelink\" onclick=\"openClose('{$type}list-$id');\"";
                switch($type) {