don't send diaspora profile updates in batch mode

diff --git a/boot.php b/boot.php
index 3e1706725b98c67c43bc06d2dce21b5212c7d037..2a5b7a71ae4477af2461d26ca83b5665fc9427ad 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDIKA_PLATFORM',     'Friendica');
-define ( 'FRIENDIKA_VERSION',      '2.3.1151' );
+define ( 'FRIENDIKA_VERSION',      '2.3.1152' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1100      );
 

diff --git a/include/profile_update.php b/include/profile_update.php
index bd7f678ed9aea94d7cb915a9c5cd3b7d57a135ce..61eaee75d92ae64641c567f4dcdf55704d938079 100644 (file)
--- a/include/profile_update.php
+++ b/include/profile_update.php
@@ -15,8 +15,8 @@ function profile_change() {
 //   if($url && strlen(get_config('system','directory_submit_url')))
 //      proc_run('php',"include/directory.php","$url");
 
-       $recips = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s'
-               AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ",
+       $recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
+               AND `uid` = %d AND `rel` != %d ",
                dbesc(NETWORK_DIASPORA),
                intval(local_user()),
                intval(CONTACT_IS_SHARING)
@@ -101,7 +101,7 @@ function profile_change() {
        logger('profile_change: ' . $msg, LOGGER_ALL);
 
        foreach($recips as $recip) {
-               $msgtosend = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$a->user,$recip,$a->user['prvkey'],null,true)));
-               add_to_queue($recip['id'],NETWORK_DIASPORA,$msgtosend,true);
+               $msgtosend = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$a->user,$recip,$a->user['prvkey'],$recip['pubkey'],false)));
+               add_to_queue($recip['id'],NETWORK_DIASPORA,$msgtosend,false);
        }
 }