From 59517f6e58fdb49e5d42784bbdb8563864510b1a Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 29 Oct 2014 01:42:43 +0100 Subject: [PATCH] Remote self is now working for diaspora contacts as well. --- include/items.php | 2 +- mod/crepair.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index 3171e4f93..ac7e34286 100644 --- a/include/items.php +++ b/include/items.php @@ -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 diff --git a/mod/crepair.php b/mod/crepair.php index aba71232c..400817d6f 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -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');