Remote self is now working for diaspora contacts as well.

diff --git a/include/items.php b/include/items.php
index 3171e4f936cd76f5c52c914acc2c05d33e29360e..ac7e34286d1bb1e6769b6e8455745dbf27376e08 100644 (file)
--- 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 aba71232c5e64f9e8da3010db11c33eb3fb38f86..400817d6f7e42588e4e18c4a8805714f2d40ffef 100644 (file)
--- 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');