Merge pull request #524 from beardy-unixer/master

[friendica.git] / mod / regmod.php

diff --git a/mod/regmod.php b/mod/regmod.php
index 76ea4062ede8becd5789b1b54a8f3324ce4148ee..21f41eb01ccc3c854443f22e3465ba50cc3797fa 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -64,6 +64,11 @@ function user_allow($hash) {
 
 }
 
+
+// This does not have to go through user_remove() and save the nickname
+// permanently against re-registration, as the person was not yet
+// allowed to have friends on this system
+
 function user_deny($hash) {
 
        $register = q("SELECT * FROM `register` WHERE `hash` = '%s' LIMIT 1",
@@ -107,7 +112,7 @@ function regmod_content(&$a) {
                return $o;
        }
 
-       if(!is_site_admin()) {
+       if((!is_site_admin()) || (x($_SESSION,'submanage') && intval($_SESSION['submanage']))) {
                notice( t('Permission denied.') . EOL);
                return '';
        }