Remote self is now working for diaspora contacts as well.
This commit is contained in:
parent
338ad1d85f
commit
59517f6e58
|
@ -2616,7 +2616,7 @@ function item_is_remote_self($contact, &$datarray) {
|
|||
return false;
|
||||
|
||||
// Prevent the forwarding of posts that are forwarded
|
||||
if ($datarray["extid"] == NETWORK_DFRN)
|
||||
if (in_array($datarray["extid"], array(NETWORK_DFRN, NETWORK_DIASPORA)))
|
||||
return false;
|
||||
|
||||
// Prevent to forward already forwarded posts
|
||||
|
|
|
@ -152,12 +152,12 @@ function crepair_content(&$a) {
|
|||
// Disable remote self for everything except feeds.
|
||||
// There is an issue when you repeat an item from maybe twitter and you got comments from friendica and twitter
|
||||
// Problem is, you couldn't reply to both networks.
|
||||
if (!in_array($contact['network'], array(NETWORK_FEED, NETWORK_DFRN)))
|
||||
if (!in_array($contact['network'], array(NETWORK_FEED, NETWORK_DFRN, NETWORK_DIASPORA)))
|
||||
$allow_remote_self = false;
|
||||
|
||||
if ($contact['network'] == NETWORK_FEED)
|
||||
$remote_self_options = array('0'=>t('No mirroring'), '1'=>t('Mirror as forwarded posting'), '2'=>t('Mirror as my own posting'));
|
||||
elseif ($contact['network'] == NETWORK_DFRN)
|
||||
else
|
||||
$remote_self_options = array('0'=>t('No mirroring'), '2'=>t('Mirror as my own posting'));
|
||||
|
||||
$tpl = get_markup_template('crepair.tpl');
|
||||
|
|
Loading…
Reference in a new issue