aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-07 18:23:55 -0800
committerfriendica <info@friendica.com>2012-03-07 18:23:55 -0800
commit395a9530dcbca95b2f2c7dde9df21ee1981fa19f (patch)
tree916466abe6ad95f256bfc102a519513d50984fcc
parent6525507a2f6a6b8f81e85a597cfa99f9f8c90279 (diff)
downloadvolse-hubzilla-395a9530dcbca95b2f2c7dde9df21ee1981fa19f.tar.gz
volse-hubzilla-395a9530dcbca95b2f2c7dde9df21ee1981fa19f.tar.bz2
volse-hubzilla-395a9530dcbca95b2f2c7dde9df21ee1981fa19f.zip
still getting parent relays on remote systems
-rwxr-xr-xinclude/items.php4
-rwxr-xr-xinclude/notifier.php2
-rwxr-xr-xjs/fk.autocomplete.js1
3 files changed, 4 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php
index fdff6b642..1a7aa6c46 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1756,7 +1756,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
$datarray['uid'] = $importer['uid'];
$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,
// 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,
@@ -2477,7 +2477,7 @@ function local_delivery($importer,$data) {
$datarray['uid'] = $importer['importer_uid'];
$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,
// 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,
diff --git a/include/notifier.php b/include/notifier.php
index 4765cca06..5b23406fc 100755
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -201,7 +201,7 @@ function notifier_run($argv, $argc){
// 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,':'))
$localhost = substr($localhost,0,strpos($localhost,':'));
diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index 509466bd9..69fe77e8c 100755
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -103,6 +103,7 @@ ACPopup.prototype._search = function(){
}
else {
txt = tinyMCE.activeEditor.getContent();
+ // alert(that.searchText + ':' + t);
newtxt = txt.replace(that.searchText,t+' ');
tinyMCE.activeEditor.setContent(newtxt);
tinyMCE.activeEditor.focus();