diff options
| author | marijus <mario@mariovavti.com> | 2014-08-22 09:17:17 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-08-22 09:17:17 +0200 |
| commit | b0d52943e85bf819d4ddf91127ca25ec7a32c289 (patch) | |
| tree | fcb7c92735bbcbae9359d3fcf91a185226698426 /mod/receive.php | |
| parent | 1a3be504516db7106ea0ce385691e5a3eca4c084 (diff) | |
| parent | c5f4e5bac76de93b30c00fa9fb3dc8a559d7b070 (diff) | |
| download | volse-hubzilla-b0d52943e85bf819d4ddf91127ca25ec7a32c289.tar.gz volse-hubzilla-b0d52943e85bf819d4ddf91127ca25ec7a32c289.tar.bz2 volse-hubzilla-b0d52943e85bf819d4ddf91127ca25ec7a32c289.zip | |
Merge branch 'upstream'
Diffstat (limited to 'mod/receive.php')
| -rw-r--r-- | mod/receive.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mod/receive.php b/mod/receive.php index c5a2dc4e0..4071b169b 100644 --- a/mod/receive.php +++ b/mod/receive.php @@ -4,8 +4,6 @@ * Diaspora endpoint */ - -//require_once('include/salmon.php'); require_once('include/crypto.php'); require_once('include/diaspora.php'); @@ -31,8 +29,11 @@ function receive_post(&$a) { $guid = argv(2); - $r = q("SELECT * FROM channel left join account on account_id = channel_account_id WHERE channel_guid = '%s' AND account_flags = 0 LIMIT 1", - dbesc($guid) + // Diaspora sites *may* provide a truncated guid. + + $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_guid like '%s' AND NOT (channel_pageflags & %d ) LIMIT 1", + dbesc($guid . '%'), + intval(PAGE_REMOVED) ); if(! $r) http_status_exit(500); |