aboutsummaryrefslogtreecommitdiffstats
path: root/mod/display.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-03-07 17:04:26 -0800
committerFriendika <info@friendika.com>2011-03-07 17:04:26 -0800
commitfb481e0b2fb62deec1b86684d1bba98c8dbbc6ef (patch)
treecf21dde91f2c60e0ad81a43c59f7a2345019d891 /mod/display.php
parent58eba782cf33203f2ddec48bcab8f19e4dca56b2 (diff)
downloadvolse-hubzilla-fb481e0b2fb62deec1b86684d1bba98c8dbbc6ef.tar.gz
volse-hubzilla-fb481e0b2fb62deec1b86684d1bba98c8dbbc6ef.tar.bz2
volse-hubzilla-fb481e0b2fb62deec1b86684d1bba98c8dbbc6ef.zip
sparkle link enhancements to display page
Diffstat (limited to 'mod/display.php')
-rw-r--r--mod/display.php22
1 files changed, 7 insertions, 15 deletions
diff --git a/mod/display.php b/mod/display.php
index 7cefc42e6..edbadbc75 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -127,6 +127,8 @@ function display_content(&$a) {
like_puller($a,$item,$dlike,'dislike');
}
+ $author_contacts = extract_item_authors($r,$a->profile['uid']);
+
foreach($r as $item) {
$template = $tpl;
@@ -172,17 +174,6 @@ function display_content(&$a) {
$sparkle = '';
- $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
- // I think this is redundant now but too chicken to remove it unless
- // I've had six cups of coffee and tested it completely
-
- if(($item['network'] === 'dfrn') && (! $item['self'] )) {
- $profile_url = $redirect_url;
- $sparkle = ' sparkle';
- }
-
-
// Top-level wall post not written by the wall owner (wall-to-wall)
// First figure out who owns it.
@@ -223,13 +214,14 @@ function display_content(&$a) {
// Can we use our special contact URL for this author?
if(strlen($item['author-link'])) {
- if((link_compare($item['author-link'],$item['url'])) && ($item['network'] === 'dfrn') && (! $item['self'])) {
+ $profile_link = $item['author-link'];
+ if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
$profile_link = $redirect_url;
$sparkle = ' sparkle';
}
- else {
- $profile_link = $item['author-link'];
- $sparkle = '';
+ elseif(isset($author_contacts[$item['author-link']])) {
+ $profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
+ $sparkle = ' sparkle';
}
}