diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /mod/regmod.php | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'mod/regmod.php')
| -rw-r--r-- | mod/regmod.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/regmod.php b/mod/regmod.php index c0a75ef48..d500de0dc 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -5,11 +5,11 @@ function regmod_content(&$a) { global $lang; - $_SESSION['return_url'] = $a->cmd; + $_SESSION['return_url'] = App::$cmd; if(! local_channel()) { info( t('Please login.') . EOL); - $o .= '<br /><br />' . login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1); + $o .= '<br /><br />' . login((App::$config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1); return $o; } @@ -25,10 +25,10 @@ function regmod_content(&$a) { $hash = argv(2); if($cmd === 'deny') { - if (!user_deny($hash)) killme(); + if (! account_deny($hash)) killme(); } if($cmd === 'allow') { - if (!user_allow($hash)) killme(); + if (! account_allow($hash)) killme(); } } |