aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-11-01 14:24:56 -0700
committerFriendika <info@friendika.com>2011-11-01 14:24:56 -0700
commitae7425dadb2e8e2911f405631e332965066a916b (patch)
treef7297ae147a9a983574e7372501e747f63afc371
parent05eca449c82c9b574321b71864406bab3f926442 (diff)
downloadvolse-hubzilla-ae7425dadb2e8e2911f405631e332965066a916b.tar.gz
volse-hubzilla-ae7425dadb2e8e2911f405631e332965066a916b.tar.bz2
volse-hubzilla-ae7425dadb2e8e2911f405631e332965066a916b.zip
don't send diaspora profile updates in batch mode
-rw-r--r--boot.php2
-rw-r--r--include/profile_update.php8
2 files changed, 5 insertions, 5 deletions
diff --git a/boot.php b/boot.php
index 3e1706725..2a5b7a71a 100644
--- 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 bd7f678ed..61eaee75d 100644
--- 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);
}
}