diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-27 19:27:38 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-27 19:27:38 -0700 |
| commit | b381ec57346a6d7724b2317c120ce2e6e70edc37 (patch) | |
| tree | e2cf66e01a87e438241e5bfac5daf6e7d3046b71 /include/zot.php | |
| parent | 675aa96f222877a5aa543b8409a2c580cf10d3aa (diff) | |
| parent | 11301d51a58d04843ba3056b4c9e92d59ced1334 (diff) | |
| download | volse-hubzilla-b381ec57346a6d7724b2317c120ce2e6e70edc37.tar.gz volse-hubzilla-b381ec57346a6d7724b2317c120ce2e6e70edc37.tar.bz2 volse-hubzilla-b381ec57346a6d7724b2317c120ce2e6e70edc37.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/impel.php
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php index 694338a9e..5f93ba75b 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1097,7 +1097,7 @@ function zot_import($arr, $sender_url) { } stringify_array_elms($recip_arr); $recips = implode(',',$recip_arr); - $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and not ( channel_pageflags & %d )>0 ", + $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and not ( channel_pageflags & %d ) > 0 ", intval(PAGE_REMOVED) ); if(! $r) { @@ -1361,7 +1361,8 @@ function public_recips($msg) { if(($tag['type'] === 'mention') && (strpos($tag['url'],z_root()) !== false)) { $address = basename($tag['url']); if($address) { - $z = q("select channel_hash as hash from channel where channel_address = '%s' limit 1", + $z = q("select channel_hash as hash from channel where channel_address = '%s' + and ( channel_pageflags & " . intval(PAGE_REMOVED) . " ) = 0 limit 1", dbesc($address) ); if($z) @@ -1465,7 +1466,7 @@ function allowed_public_recips($msg) { $condensed_recips[] = $rr['hash']; $results = array(); - $r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and not ( channel_pageflags & %d ) > 0 ", + $r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and ( channel_pageflags & %d ) = 0 ", dbesc($hash), intval(PAGE_REMOVED) ); |