aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinclude/diaspora.php5
-rw-r--r--include/event.php1
-rwxr-xr-xinclude/items.php3
-rw-r--r--version.inc2
4 files changed, 9 insertions, 2 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index 79d3909ca..74a56dd79 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1009,6 +1009,11 @@ function diaspora_post($importer,$xml,$msg) {
return 202;
}
+ if(! post_is_importable($datarray,$contact)) {
+ logger('diaspora_post: filtering this author.');
+ return 202;
+ }
+
$result = item_store($datarray);
return;
diff --git a/include/event.php b/include/event.php
index a1fae617d..b130ef47f 100644
--- a/include/event.php
+++ b/include/event.php
@@ -496,7 +496,6 @@ function event_import_ical($ical, $uid) {
$ev['private'] = 1;
$ev['allow_cid'] = '<' . $channel['channel_hash'] . '>';
-
// logger('storing event: ' . print_r($ev,true), LOGGER_ALL);
$event = event_store_event($ev);
if($event) {
diff --git a/include/items.php b/include/items.php
index f0b7d6a7f..c807c1d5d 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3762,6 +3762,9 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
$author['owner_avatar'] = $contact['thumb'];
}
+ if(! post_is_importable($datarray,$contact))
+ continue;
+
logger('consume_feed: author ' . print_r($author,true),LOGGER_DEBUG);
logger('consume_feed: ' . print_r($datarray,true),LOGGER_DATA);
diff --git a/version.inc b/version.inc
index 157b3f838..3a20d2696 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-07-28.1107
+2015-07-29.1108