aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2011-12-11 20:03:46 -0800
committerfriendica <info@friendica.com>2011-12-11 20:03:46 -0800
commit50c4b9a7803c08d6e41fc64ca3ffeb66c7f450ba (patch)
tree1d67ee1261c481ac6423cd3897dbba40c75c0de1 /mod
parent3da3cd686cc7fa51e2c98e98dbf8bd3a65880bdd (diff)
parent834639ebab3daded63c3ed076273e69b798ced90 (diff)
downloadvolse-hubzilla-50c4b9a7803c08d6e41fc64ca3ffeb66c7f450ba.tar.gz
volse-hubzilla-50c4b9a7803c08d6e41fc64ca3ffeb66c7f450ba.tar.bz2
volse-hubzilla-50c4b9a7803c08d6e41fc64ca3ffeb66c7f450ba.zip
Merge branch 'master' into notify
Diffstat (limited to 'mod')
-rw-r--r--mod/register.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/mod/register.php b/mod/register.php
index 6ebe35dbf..0115ec0d5 100644
--- a/mod/register.php
+++ b/mod/register.php
@@ -452,7 +452,12 @@ function register_content(&$a) {
$block = get_config('system','block_extended_register');
- if((($a->config['register_policy'] == REGISTER_CLOSED) && (! local_user())) || ($block)) {
+ if(local_user() && ($block)) {
+ notice("Permission denied." . EOL);
+ return;
+ }
+
+ if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
notice("Permission denied." . EOL);
return;
}