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

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica
2014-01-09 14:11:05 -08:00
parent ca570f97e0 bf31ec04cf
commit fe7aa9926b
4 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/identity.php
View File

@@ -1023,7 +1023,7 @@ function zid_init(&$a) {
dbesc($tmp_str)
);
// try to avoid recursion - but send them home to do a proper magic auth
$dest = '/' . $a->query_string;
$dest = '/' . urlencode($a->query_string);
$dest = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$dest);
if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic')) && (! strstr($dest,'/rmagic'))) {
goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&dest=' . z_root() . $dest);
@@ -1140,4 +1140,4 @@ function is_foreigner($s) {
function is_member($s) {
return((is_foreigner($s)) ? false : true);
}
}

10
include/items.php
View File

@@ -1602,8 +1602,14 @@ function item_store($arr,$allow_exec = false) {
$arr['llink'] = z_root() . '/display/' . $arr['mid'];
if(! $arr['plink'])
$arr['plink'] = $arr['llink'];
if((! $arr['plink'])) {
if (local_user() && ($arr['item_flags'] & ITEM_THREAD_TOP)) {
$channel = get_app()->get_channel();
$arr['plink'] = z_root() . '/channel/' . $channel['channel_address'] . '/?mid=' . $arr['mid'];
} else {
$arr['plink'] = $arr['llink'];
}
}
if($arr['parent_mid'] === $arr['mid']) {
$parent_id = 0;

2
include/text.php
View File

@@ -1391,7 +1391,7 @@ function feed_salmonlinks($nick) {
function get_plink($item,$mode) {
$a = get_app();
if($mode == 'display')
if(($mode == 'display') || ($mode == 'channel') || ($mode == 'network'))
$key = 'plink';
else
$key = 'llink';