use sha1 keys for friends as well

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index a6e03440b42fb8d15d5f4def1f21f59da883646c..6e781f4fa3df418a53b08afb9a2a5011b7bfc9b2 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -41,7 +41,7 @@ function network_content(&$a, $update = 0) {
                        '$geotag' => $geotag
                ));
 
-               require_once('view/acl_selectors.php');
+               require_once('include/acl_selectors.php');
 
                $tpl = load_view_file("view/jot.tpl");
                
@@ -156,7 +156,9 @@ function network_content(&$a, $update = 0) {
                        $template = $tpl;
                        $commentww = '';
                        $owner_url = $owner_photo = $owner_name = '';
+
                        $profile_url = $item['url'];
+
                        $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
                        if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
@@ -237,8 +239,11 @@ function network_content(&$a, $update = 0) {
 
                        // Post was remotely authored.
 
-                       $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
-                       $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $thumb);
+                       $diff_author = (($item['url'] !== $item['author-link']) ? true : false);
+
+                       $profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+                       $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
+
 
                        $profile_link = $profile_url;