still getting parent relays on remote systems
This commit is contained in:
parent
6525507a2f
commit
395a9530dc
|
@ -1756,7 +1756,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
|
||||||
$datarray['uid'] = $importer['uid'];
|
$datarray['uid'] = $importer['uid'];
|
||||||
$datarray['contact-id'] = $contact['id'];
|
$datarray['contact-id'] = $contact['id'];
|
||||||
|
|
||||||
if(x($datarray,'owner-link') && strlen($datarray['owner-link']) && (! link_compare($datarray['owner-link'],$contact['url']))) {
|
if(! link_compare($datarray['owner-link'],$contact['url'])) {
|
||||||
// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
|
// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
|
||||||
// but otherwise there's a possible data mixup on the sender's system.
|
// but otherwise there's a possible data mixup on the sender's system.
|
||||||
// the tgroup delivery code called from item_store will correct it if it's a forum,
|
// the tgroup delivery code called from item_store will correct it if it's a forum,
|
||||||
|
@ -2477,7 +2477,7 @@ function local_delivery($importer,$data) {
|
||||||
$datarray['uid'] = $importer['importer_uid'];
|
$datarray['uid'] = $importer['importer_uid'];
|
||||||
$datarray['contact-id'] = $importer['id'];
|
$datarray['contact-id'] = $importer['id'];
|
||||||
|
|
||||||
if(x($datarray,'owner-link') && strlen($datarray['owner-link']) && (! link_compare($datarray['owner-link'],$importer['url']))) {
|
if(! link_compare($datarray['owner-link'],$contact['url'])) {
|
||||||
// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
|
// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
|
||||||
// but otherwise there's a possible data mixup on the sender's system.
|
// but otherwise there's a possible data mixup on the sender's system.
|
||||||
// the tgroup delivery code called from item_store will correct it if it's a forum,
|
// the tgroup delivery code called from item_store will correct it if it's a forum,
|
||||||
|
|
|
@ -201,7 +201,7 @@ function notifier_run($argv, $argc){
|
||||||
// by stringing togther an array of retractions and sending them onward.
|
// by stringing togther an array of retractions and sending them onward.
|
||||||
|
|
||||||
|
|
||||||
$localhost = $a->get_hostname();
|
$localhost = str_replace('www.','',$a->get_hostname());
|
||||||
if(strpos($localhost,':'))
|
if(strpos($localhost,':'))
|
||||||
$localhost = substr($localhost,0,strpos($localhost,':'));
|
$localhost = substr($localhost,0,strpos($localhost,':'));
|
||||||
|
|
||||||
|
|
|
@ -103,6 +103,7 @@ ACPopup.prototype._search = function(){
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
txt = tinyMCE.activeEditor.getContent();
|
txt = tinyMCE.activeEditor.getContent();
|
||||||
|
// alert(that.searchText + ':' + t);
|
||||||
newtxt = txt.replace(that.searchText,t+' ');
|
newtxt = txt.replace(that.searchText,t+' ');
|
||||||
tinyMCE.activeEditor.setContent(newtxt);
|
tinyMCE.activeEditor.setContent(newtxt);
|
||||||
tinyMCE.activeEditor.focus();
|
tinyMCE.activeEditor.focus();
|
||||||
|
|
Loading…
Reference in a new issue