diff options
| author | root <root@diekershoff.homeunix.net> | 2011-01-24 07:44:08 +0100 |
|---|---|---|
| committer | root <root@diekershoff.homeunix.net> | 2011-01-24 07:44:08 +0100 |
| commit | 80a7e68528e7a4d95c168889f1a2fb9eccf6e3b9 (patch) | |
| tree | 5a59cf3b29a70f22728e25d7c46ab8648bcda407 /mod/display.php | |
| parent | 71294faf2c182a678e5889b2ff9cabed16d83c82 (diff) | |
| parent | 4198efe03570606b35f3aba6cdf7f80de20384f4 (diff) | |
| download | volse-hubzilla-80a7e68528e7a4d95c168889f1a2fb9eccf6e3b9.tar.gz volse-hubzilla-80a7e68528e7a4d95c168889f1a2fb9eccf6e3b9.tar.bz2 volse-hubzilla-80a7e68528e7a4d95c168889f1a2fb9eccf6e3b9.zip | |
Merge branch 'master' of git://github.com/tobiasd/friendika
Diffstat (limited to 'mod/display.php')
| -rw-r--r-- | mod/display.php | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/mod/display.php b/mod/display.php index de11ec35d..3215ae90a 100644 --- a/mod/display.php +++ b/mod/display.php @@ -173,6 +173,9 @@ function display_content(&$a) { $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'; @@ -216,7 +219,18 @@ function display_content(&$a) { $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $item['thumb']); - $profile_link = $profile_url; + // 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 = $redirect_url; + $sparkle = ' sparkle'; + } + else { + $profile_link = $item['author-link']; + $sparkle = ''; + } + } if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user())) $drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'])); @@ -291,6 +305,9 @@ function display_content(&$a) { } } + + $o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>'; + return $o; } |