Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
f6033d29
Commit
f6033d29
authored
Sep 11, 2004
by
Steven Wittens
Browse files
#10733
: fixing broken user registration due to roles selection patch.
parent
94e759a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/user.module
View file @
f6033d29
...
...
@@ -928,6 +928,7 @@ function user_register($edit = array()) {
}
if
(
$edit
)
{
$edit
[
'roles'
]
=
array
(
_user_authenticated_id
());
// needed for validation
user_module_invoke
(
'validate'
,
$edit
,
$edit
,
'account'
);
if
(
!
form_get_errors
())
{
...
...
@@ -936,7 +937,7 @@ function user_register($edit = array()) {
// TODO: Is this necessary? Won't session_write() replicate this?
unset
(
$edit
[
'session'
]);
$account
=
user_save
(
''
,
array
(
'name'
=>
$edit
[
'name'
],
'pass'
=>
$pass
,
'init'
=>
$edit
[
'mail'
],
'mail'
=>
$edit
[
'mail'
],
'roles'
=>
array
(
_user_authenticated_id
())
,
'status'
=>
(
variable_get
(
'user_register'
,
1
)
==
1
?
1
:
0
)));
$account
=
user_save
(
''
,
array
(
'name'
=>
$edit
[
'name'
],
'pass'
=>
$pass
,
'init'
=>
$edit
[
'mail'
],
'mail'
=>
$edit
[
'mail'
],
'roles'
=>
$edit
[
'roles'
]
,
'status'
=>
(
variable_get
(
'user_register'
,
1
)
==
1
?
1
:
0
)));
watchdog
(
'user'
,
t
(
'New user: %name %e-mail.'
,
array
(
'%name'
=>
'<em>'
.
$edit
[
'name'
]
.
'</em>'
,
'%e-mail'
=>
'<em><'
.
$edit
[
'mail'
]
.
'></em>'
)),
l
(
t
(
'edit'
),
'user/'
.
$account
->
uid
.
'/edit'
));
$variables
=
array
(
'%username'
=>
$edit
[
'name'
],
'%site'
=>
variable_get
(
'site_name'
,
'drupal'
),
'%password'
=>
$pass
,
'%uri'
=>
$base_url
,
'%uri_brief'
=>
substr
(
$base_url
,
strlen
(
'http://'
)),
'%mailto'
=>
$edit
[
'mail'
],
'%date'
=>
format_date
(
time
()),
'%login_uri'
=>
url
(
'user/login'
,
NULL
,
NULL
,
TRUE
),
'%edit_uri'
=>
url
(
'user/'
.
$account
->
uid
.
'/edit'
,
NULL
,
NULL
,
TRUE
));
...
...
modules/user/user.module
View file @
f6033d29
...
...
@@ -928,6 +928,7 @@ function user_register($edit = array()) {
}
if
(
$edit
)
{
$edit
[
'roles'
]
=
array
(
_user_authenticated_id
());
// needed for validation
user_module_invoke
(
'validate'
,
$edit
,
$edit
,
'account'
);
if
(
!
form_get_errors
())
{
...
...
@@ -936,7 +937,7 @@ function user_register($edit = array()) {
// TODO: Is this necessary? Won't session_write() replicate this?
unset
(
$edit
[
'session'
]);
$account
=
user_save
(
''
,
array
(
'name'
=>
$edit
[
'name'
],
'pass'
=>
$pass
,
'init'
=>
$edit
[
'mail'
],
'mail'
=>
$edit
[
'mail'
],
'roles'
=>
array
(
_user_authenticated_id
())
,
'status'
=>
(
variable_get
(
'user_register'
,
1
)
==
1
?
1
:
0
)));
$account
=
user_save
(
''
,
array
(
'name'
=>
$edit
[
'name'
],
'pass'
=>
$pass
,
'init'
=>
$edit
[
'mail'
],
'mail'
=>
$edit
[
'mail'
],
'roles'
=>
$edit
[
'roles'
]
,
'status'
=>
(
variable_get
(
'user_register'
,
1
)
==
1
?
1
:
0
)));
watchdog
(
'user'
,
t
(
'New user: %name %e-mail.'
,
array
(
'%name'
=>
'<em>'
.
$edit
[
'name'
]
.
'</em>'
,
'%e-mail'
=>
'<em><'
.
$edit
[
'mail'
]
.
'></em>'
)),
l
(
t
(
'edit'
),
'user/'
.
$account
->
uid
.
'/edit'
));
$variables
=
array
(
'%username'
=>
$edit
[
'name'
],
'%site'
=>
variable_get
(
'site_name'
,
'drupal'
),
'%password'
=>
$pass
,
'%uri'
=>
$base_url
,
'%uri_brief'
=>
substr
(
$base_url
,
strlen
(
'http://'
)),
'%mailto'
=>
$edit
[
'mail'
],
'%date'
=>
format_date
(
time
()),
'%login_uri'
=>
url
(
'user/login'
,
NULL
,
NULL
,
TRUE
),
'%edit_uri'
=>
url
(
'user/'
.
$account
->
uid
.
'/edit'
,
NULL
,
NULL
,
TRUE
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment