diff options
| author | friendica <info@friendica.com> | 2014-02-16 14:48:07 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-16 14:48:07 -0800 |
| commit | 16cd9e2a7e111b4c1ea8babb69862cb82775fa09 (patch) | |
| tree | 6e9cc13ab2b702e52d2717413600a62ad610fa0a | |
| parent | 663dd39015e3e7ef25dda94f34bfb40c7e494325 (diff) | |
| download | volse-hubzilla-16cd9e2a7e111b4c1ea8babb69862cb82775fa09.tar.gz volse-hubzilla-16cd9e2a7e111b4c1ea8babb69862cb82775fa09.tar.bz2 volse-hubzilla-16cd9e2a7e111b4c1ea8babb69862cb82775fa09.zip | |
don't include deleted channels in number of channels service class checks
| -rw-r--r-- | include/identity.php | 12 | ||||
| -rw-r--r-- | mod/manage.php | 5 |
2 files changed, 11 insertions, 6 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; diff --git a/mod/manage.php b/mod/manage.php index a2f65b271..0772e2d61 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -55,8 +55,9 @@ function manage_content(&$a) { } } - $r = q("select count(channel_id) as total from channel where channel_account_id = %d ", - intval(get_account_id()) + $r = q("select count(channel_id) as total from channel where channel_account_id = %d and not ( channel_pageflags & %d )", + intval(get_account_id()), + intval(PAGE_REMOVED) ); $limit = service_class_fetch(local_user(),'total_identities'); if($limit !== false) { |