harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
friendica 2013-10-20 20:29:52 -07:00
parent 5c5174b008
commit c48da79adf
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ItemObject.php
View File

@ -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 : ''),

2
include/conversation.php
View File

@ -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,

13
include/text.php
View File

@ -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'),
);
}

2
version.inc
View File

@ -1 +1 @@
2013-10-19.471
2013-10-20.472