Bugfix: The "keywords" field in the gcontact table wasn't set correctly

diff --git a/include/socgraph.php b/include/socgraph.php
index c545343393d869265e50a016bc5390c764afd320..3b8e9140f8eb476b36d30f553eedb81679d03dba 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -139,15 +139,16 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
                poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid);
 
                // Update the Friendica contacts. Diaspora is doing it via a message. (See include/diaspora.php)
-               if (($location != "") OR ($about != "") OR ($keywords != "") OR ($gender != ""))
-                       q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s'
-                               WHERE `nurl` = '%s' AND NOT `self` AND `network` = '%s'",
-                               dbesc($location),
-                               dbesc($about),
-                               dbesc($keywords),
-                               dbesc($gender),
-                               dbesc(normalise_link($profile_url)),
-                               dbesc(NETWORK_DFRN));
+               // Deactivated because we now update Friendica contacts in dfrn.php
+               //if (($location != "") OR ($about != "") OR ($keywords != "") OR ($gender != ""))
+               //      q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s'
+               //              WHERE `nurl` = '%s' AND NOT `self` AND `network` = '%s'",
+               //              dbesc($location),
+               //              dbesc($about),
+               //              dbesc($keywords),
+               //              dbesc($gender),
+               //              dbesc(normalise_link($profile_url)),
+               //              dbesc(NETWORK_DFRN));
        }
        logger("poco_load: loaded $total entries",LOGGER_DEBUG);
 
@@ -1554,7 +1555,7 @@ function update_gcontact($contact) {
 
        if ($update) {
                q("UPDATE `gcontact` SET `photo` = '%s', `name` = '%s', `nick` = '%s', `addr` = '%s', `network` = '%s',
-                                       `birthday` = '%s', `gender` = '%s', `keywords` = %d, `hide` = %d, `nsfw` = %d,
+                                       `birthday` = '%s', `gender` = '%s', `keywords` = '%s', `hide` = %d, `nsfw` = %d,
                                        `alias` = '%s', `notify` = '%s', `url` = '%s',
                                        `location` = '%s', `about` = '%s', `generation` = %d, `updated` = '%s',
                                        `server_url` = '%s', `connect` = '%s'

diff --git a/mod/pubsub.php b/mod/pubsub.php
index beb73b4e2c4ce53a9ed5a6fcaf3ea56108e2040c..6053ee2fbe1553e60d1fa182aff303fbd8e1dad0 100644 (file)
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -122,8 +122,8 @@ function pubsub_post(&$a) {
 
        $importer = $r[0];
 
-       $r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d
-               AND ( `rel` = %d OR `rel` = %d OR network = '%s' ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+       $r = q("SELECT * FROM `contact` WHERE `subhub` AND `id` = %d AND `uid` = %d
+               AND (`rel` = %d OR `rel` = %d OR network = '%s') AND NOT `blocked` LIMIT 1",
                intval($contact_id),
                intval($importer['uid']),
                intval(CONTACT_IS_SHARING),