friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Remote self is now working for diaspora contacts as well.

This commit is contained in:
Michael Vogel 2014-10-29 01:42:43 +01:00
parent 338ad1d85f
commit 59517f6e58
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/items.php
View File

@ -2616,7 +2616,7 @@ function item_is_remote_self($contact, &$datarray) {
return false; return false;
// Prevent the forwarding of posts that are forwarded // 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; return false;
// Prevent to forward already forwarded posts // Prevent to forward already forwarded posts

4
mod/crepair.php
View File

@ -152,12 +152,12 @@ function crepair_content(&$a) {
// Disable remote self for everything except feeds. // 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 // 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. // 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; $allow_remote_self = false;
if ($contact['network'] == NETWORK_FEED) 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')); $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')); $remote_self_options = array('0'=>t('No mirroring'), '2'=>t('Mirror as my own posting'));
$tpl = get_markup_template('crepair.tpl'); $tpl = get_markup_template('crepair.tpl');