aboutsummaryrefslogtreecommitdiffstats
path: root/mod/network.php
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-08-19 04:59:31 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-08-19 04:59:31 -0700
commite0045a43e22082e0a47fd57288105a21311e911a (patch)
treed20f36060be22a5c83526ca2a3654f1e4a31ace0 /mod/network.php
parent6ed5b642a437a86077093391f3f2ec9889068d8d (diff)
downloadvolse-hubzilla-e0045a43e22082e0a47fd57288105a21311e911a.tar.gz
volse-hubzilla-e0045a43e22082e0a47fd57288105a21311e911a.tar.bz2
volse-hubzilla-e0045a43e22082e0a47fd57288105a21311e911a.zip
mongo checkin, global directory, redir rework, location basics
Diffstat (limited to 'mod/network.php')
-rw-r--r--mod/network.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/network.php b/mod/network.php
index 982c381f2..027248bdd 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -148,7 +148,8 @@ function network_content(&$a, $update = false) {
$template = $wallwall;
$commentww = 'ww';
// If it is our contact, use a friendly redirect link
- if($item['owner-link'] == $item['url'])
+ if(($item['owner-link'] == $item['url']) && ($item['rel'] == DIRECTION_IN || $item['rel'] == DIRECTION_BOTH))
+ $owner_url = $redirect_url;
$owner_url = $redirect_url;
}
@@ -179,7 +180,7 @@ function network_content(&$a, $update = false) {
- if(($item['contact-uid'] == $_SESSION['uid']) && (strlen($item['dfrn-id'])) && (! $item['self'] ))
+ if(($item['contact-uid'] == $_SESSION['uid']) && ($item['rel] == DIRECTION_IN || $item['rel'] == DIRECTION_BOTH) && (! $item['self'] ))
$profile_url = $redirect_url;
$photo = $item['photo'];
@@ -211,6 +212,7 @@ function network_content(&$a, $update = false) {
'$title' => $item['title'],
'$body' => bbcode($item['body']),
'$ago' => relative_date($item['created']),
+ '$location' => (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''),
'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
'$owner_url' => $owner_url,
'$owner_photo' => $owner_photo,