Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / src / Worker / Notifier.php

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index ac8cf123c5a8d4e6a02109877b80a12b7bcf682e..b261b32fc0444b2ecf657026bbbfe2756cbe506f 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -108,7 +108,7 @@ class Notifier {
                        $recipients[] = $suggest[0]['cid'];
                        $item = $suggest[0];
                } elseif ($cmd === 'removeme') {
-                       $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
+                       $r = q("SELECT `contact`.*, `user`.`prvkey` AS `uprvkey`,
                                        `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
                                        `user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`, `user`.`guid`
                                FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
@@ -173,7 +173,7 @@ class Notifier {
 
                }
 
-               $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`,
+               $r = q("SELECT `contact`.*, `user`.`prvkey` AS `uprvkey`,
                        `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
                        `user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`
                        FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`