diff options
| author | Friendika <info@friendika.com> | 2011-11-01 00:50:41 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-11-01 00:50:41 -0700 |
| commit | f4518c646a588177e93a05363f07b61dce3fb563 (patch) | |
| tree | bedbd28944b5ce19564fc2b362ffb9938b293c07 /include | |
| parent | 58d21fe20a0b5218885b9422af5db750682dabad (diff) | |
| download | volse-hubzilla-f4518c646a588177e93a05363f07b61dce3fb563.tar.gz volse-hubzilla-f4518c646a588177e93a05363f07b61dce3fb563.tar.bz2 volse-hubzilla-f4518c646a588177e93a05363f07b61dce3fb563.zip | |
fixes to diaspora profiles, batch mode duplicates, social graph table name
Diffstat (limited to 'include')
| -rw-r--r-- | include/notifier.php | 2 | ||||
| -rw-r--r-- | include/profile_update.php | 4 | ||||
| -rw-r--r-- | include/socgraph.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/notifier.php b/include/notifier.php index 61274bedf..cc53a17c4 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -710,7 +710,7 @@ function notifier_run($argv, $argc){ if($public_message) { $r1 = q("SELECT DISTINCT(`batch`), `id`, `name`,`network` FROM `contact` WHERE `network` = '%s' - AND `uid` = %d AND `rel` != %d ORDER BY rand() ", + AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ", dbesc(NETWORK_DIASPORA), intval($owner['uid']), intval(CONTACT_IS_SHARING) diff --git a/include/profile_update.php b/include/profile_update.php index f2a806cfd..bd7f678ed 100644 --- a/include/profile_update.php +++ b/include/profile_update.php @@ -16,7 +16,7 @@ function profile_change() { // 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 ORDER BY rand() ", + AND `uid` = %d AND `rel` != %d group by `batch` ORDER BY rand() ", 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 = diaspora_msg_build($msg,$a->user,$recip,$a->user['prvkey'],null,true); + $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); } } diff --git a/include/socgraph.php b/include/socgraph.php index 17cf3fcd5..3e9c00633 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -118,7 +118,7 @@ function poco_load($cid,$uid = 0,$url = null) { } - q("delete from gcid where `cid` = %d and `uid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY", + q("delete from glink where `cid` = %d and `uid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY", intval($cid), intval($uid) ); |