diff options
| author | Olivier Migeot <olivier@migeot.org> | 2011-10-04 11:45:57 +0200 |
|---|---|---|
| committer | Olivier Migeot <olivier@migeot.org> | 2011-10-04 11:45:57 +0200 |
| commit | 273594af62c960b5a52da5ec1cf6d6bd450415ba (patch) | |
| tree | 5f79914d28c343f7642ecb13b99f9e0e3f5090a7 /mod/pubsub.php | |
| parent | 1548449586f17c0ef9bfab0ffb16f2a495fc6082 (diff) | |
| parent | dfd5cc57c2134067dc6229b8583b5e808f160004 (diff) | |
| download | volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.gz volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.tar.bz2 volse-hubzilla-273594af62c960b5a52da5ec1cf6d6bd450415ba.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/pubsub.php')
| -rw-r--r-- | mod/pubsub.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/pubsub.php b/mod/pubsub.php index 4dff5d531..b2f006927 100644 --- a/mod/pubsub.php +++ b/mod/pubsub.php @@ -44,7 +44,7 @@ function pubsub_init(&$a) { $subscribe = (($hub_mode === 'subscribe') ? 1 : 0); - $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1", + $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1", dbesc($nick) ); if(! count($r)) @@ -99,7 +99,7 @@ function pubsub_post(&$a) { $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 ); - $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1", + $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1", dbesc($nick) ); if(! count($r)) |