diff options
| author | zottel <github@zottel.net> | 2014-02-17 08:17:47 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2014-02-17 08:17:47 +0100 |
| commit | 2bca2199112625593eb412584e17e874e71ca913 (patch) | |
| tree | c6679ddb544217a10d8255578009c4ba8951bc6b /include/identity.php | |
| parent | 54727d3a66df92596378ea7f5c412d5e6037b037 (diff) | |
| parent | f38ab0904101366bf536d46ab460dcd5cf4f60ca (diff) | |
| download | volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.tar.gz volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.tar.bz2 volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/identity.php')
| -rw-r--r-- | include/identity.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/identity.php b/include/identity.php index 627e808ea..d0fffaede 100644 --- a/include/identity.php +++ b/include/identity.php @@ -22,8 +22,9 @@ require_once('include/crypto.php'); function identity_check_service_class($account_id) { $ret = array('success' => false, $message => ''); - $r = q("select count(channel_id) as total from channel where channel_account_id = %d ", - intval($account_id) + $r = q("select count(channel_id) as total from channel where channel_account_id = %d and not ( channel_pageflags & %d ) ", + intval($account_id), + intval(PAGE_REMOVED) ); if(! ($r && count($r))) { $ret['message'] = t('Unable to obtain identity information from database'); @@ -101,7 +102,7 @@ function get_sys_channel() { /** * @channel_total() - * Return the total number of channels on this site. No filtering is performed. + * Return the total number of channels on this site. No filtering is performed except to check PAGE_REMOVED * * @returns int * on error returns boolean false @@ -109,7 +110,10 @@ function get_sys_channel() { */ function channel_total() { - $r = q("select channel_id from channel where true"); + $r = q("select channel_id from channel where not ( channel_pageflags & %d )", + intval(PAGE_REMOVED) + ); + if(is_array($r)) return count($r); return false; |