Merge remote-tracking branch 'upstream/develop' into 1508-random-becomes-guid
This commit is contained in:
commit
43fda0d626
6 changed files with 796 additions and 755 deletions
|
@ -857,7 +857,7 @@ function admin_page_users_post(&$a){
|
|||
$nu_nickname = ( x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : '');
|
||||
$nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : '');
|
||||
|
||||
check_form_security_token_redirectOnErr($a->get_baseurl().'/admin/users', 'admin_users');
|
||||
check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
|
||||
|
||||
if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) {
|
||||
require_once('include/user.php');
|
||||
|
|
|
@ -121,13 +121,13 @@ function regmod_content(&$a) {
|
|||
|
||||
if($cmd === 'deny') {
|
||||
user_deny($hash);
|
||||
goaway("/admin/users/");
|
||||
goaway($a->get_baseurl()."/admin/users/");
|
||||
killme();
|
||||
}
|
||||
|
||||
if($cmd === 'allow') {
|
||||
user_allow($hash);
|
||||
goaway("/admin/users/");
|
||||
goaway($a->get_baseurl()."/admin/users/");
|
||||
killme();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue