Merge pull request #2347 from annando/1602-dfrn-forum

[friendica.git] / include / dfrn.php

diff --git a/include/dfrn.php b/include/dfrn.php
index c4999a08e14b16ab66513b01798a49c5e0063082..8938a9b6f7888ec54f50d813fe17e58d01b41bdb 100644 (file)
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -1252,8 +1252,10 @@ class dfrn {
                         // Update check for this field has to be done differently
                        $datefields = array("name-date", "uri-date");
                        foreach ($datefields AS $field)
-                               if (strtotime($contact[$field]) > strtotime($r[0][$field]))
+                               if (strtotime($contact[$field]) > strtotime($r[0][$field])) {
+                                       logger("Difference for contact ".$contact["id"]." in field '".$field."'. Old value: '".$contact[$field]."', new value '".$r[0][$field]."'", LOGGER_DEBUG);
                                        $update = true;
+                               }
 
                        foreach ($fields AS $field => $data)
                                if ($contact[$field] != $r[0][$field]) {
@@ -2051,10 +2053,14 @@ class dfrn {
                        if (($item["network"] != $author["network"]) AND ($author["network"] != ""))
                                $item["network"] = $author["network"];
 
-                       if($importer["rel"] == CONTACT_IS_FOLLOWER) {
-                               logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG);
-                               return;
-                       }
+                       // This code was taken from the old DFRN code
+                       // When activated, forums don't work.
+                       // And: Why should we disallow commenting by followers?
+                       // the behaviour is now similar to the Diaspora part.
+                       //if($importer["rel"] == CONTACT_IS_FOLLOWER) {
+                       //      logger("Contact ".$importer["id"]." is only follower. Quitting", LOGGER_DEBUG);
+                       //      return;
+                       //}
                }
 
                if ($entrytype == DFRN_REPLY_RC) {