diff options
| author | friendica <info@friendica.com> | 2013-10-20 20:29:52 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-10-20 20:29:52 -0700 |
| commit | c48da79adf648370beeeb0bab18f89963babebaa (patch) | |
| tree | f170c74f306c430845bba62fb43e12b3efca7d2f | |
| parent | 5c5174b00837133dcebb9003d8386ef8596b0a55 (diff) | |
| download | volse-hubzilla-c48da79adf648370beeeb0bab18f89963babebaa.tar.gz volse-hubzilla-c48da79adf648370beeeb0bab18f89963babebaa.tar.bz2 volse-hubzilla-c48da79adf648370beeeb0bab18f89963babebaa.zip | |
link to source - if it's on the display page link to original source (probably on a different site). All other conversations link to 'llink' which is a local copy and may provide a richer possibility of interactions, especially if you're logged in locally and it's your own copy of the post.
| -rw-r--r-- | include/ItemObject.php | 2 | ||||
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rwxr-xr-x | include/text.php | 13 | ||||
| -rw-r--r-- | version.inc | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index fc99c50ad..59b4538df 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -229,7 +229,7 @@ class Item extends BaseObject { 'like' => $like, 'dislike' => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''), 'share' => $share, - 'plink' => get_plink($item), + 'plink' => get_plink($item,$mode), 'edpost' => ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''), 'star' => ((feature_enabled($conv->get_profile_owner(),'star_posts')) ? $star : ''), 'tagger' => ((feature_enabled($conv->get_profile_owner(),'commtag')) ? $tagger : ''), diff --git a/include/conversation.php b/include/conversation.php index f9568c23f..c1d8e91f9 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -690,7 +690,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { 'owner_name' => $owner_name, 'owner_url' => $owner_url, 'owner_photo' => $owner_photo, - 'plink' => get_plink($item), + 'plink' => get_plink($item,$mode), 'edpost' => false, 'isstarred' => $isstarred, 'star' => $star, diff --git a/include/text.php b/include/text.php index ff75535b0..1ff9d27cb 100755 --- a/include/text.php +++ b/include/text.php @@ -1337,11 +1337,16 @@ function feed_salmonlinks($nick) { } -function get_plink($item) { - $a = get_app(); - if (x($item,'plink') && ($item['item_private'] != 1)) { +function get_plink($item,$mode) { + $a = get_app(); + if($mode == 'display') + $key = 'plink'; + else + $key = 'llink'; + + if (x($item,$key) && ($item['item_private'] != 1)) { return array( - 'href' => zid($item['plink']), + 'href' => zid($item[$key]), 'title' => t('link to source'), ); } diff --git a/version.inc b/version.inc index 7398de6a6..82c7eb02a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-10-19.471 +2013-10-20.472 |