Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
drupal
Commits
738cebba
Commit
738cebba
authored
Mar 09, 2003
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Moved some block up to avoid the user module duplicating data.
parent
accb3067
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
26 deletions
+36
-26
modules/user.module
modules/user.module
+18
-13
modules/user/user.module
modules/user/user.module
+18
-13
No files found.
modules/user.module
View file @
738cebba
...
...
@@ -903,19 +903,6 @@ function user_edit($edit = array()) {
$error
=
t
(
"The e-mail address '%s' is already taken."
,
array
(
"%s"
=>
$edit
[
"mail"
]));
}
else
if
(
$user
->
uid
)
{
foreach
(
module_list
()
as
$module
)
{
if
(
module_hook
(
$module
,
"user"
))
{
$result
=
module_invoke
(
$module
,
"user"
,
"edit_validate"
,
$edit
,
$user
);
}
if
(
is_array
(
$result
))
{
$data
=
array_merge
(
$data
,
$result
);
}
elseif
(
is_string
(
$result
))
{
$error
=
$result
;
break
;
}
}
/*
** If required, check that proposed passwords match. If so,
** add new password to $edit.
...
...
@@ -947,6 +934,24 @@ function user_edit($edit = array()) {
$edit
[
"session"
]
=
$user
->
session
;
}
/*
** Have the modules that extend the user information validate
** their data.
*/
foreach
(
module_list
()
as
$module
)
{
if
(
module_hook
(
$module
,
"user"
))
{
$result
=
module_invoke
(
$module
,
"user"
,
"edit_validate"
,
$edit
,
$user
);
}
if
(
is_array
(
$result
))
{
$data
=
array_merge
(
$data
,
$result
);
}
elseif
(
is_string
(
$result
))
{
$error
=
$result
;
break
;
}
}
if
(
!
$error
)
{
/*
** Save user information:
...
...
modules/user/user.module
View file @
738cebba
...
...
@@ -903,19 +903,6 @@ function user_edit($edit = array()) {
$error
=
t
(
"The e-mail address '%s' is already taken."
,
array
(
"%s"
=>
$edit
[
"mail"
]));
}
else
if
(
$user
->
uid
)
{
foreach
(
module_list
()
as
$module
)
{
if
(
module_hook
(
$module
,
"user"
))
{
$result
=
module_invoke
(
$module
,
"user"
,
"edit_validate"
,
$edit
,
$user
);
}
if
(
is_array
(
$result
))
{
$data
=
array_merge
(
$data
,
$result
);
}
elseif
(
is_string
(
$result
))
{
$error
=
$result
;
break
;
}
}
/*
** If required, check that proposed passwords match. If so,
** add new password to $edit.
...
...
@@ -947,6 +934,24 @@ function user_edit($edit = array()) {
$edit
[
"session"
]
=
$user
->
session
;
}
/*
** Have the modules that extend the user information validate
** their data.
*/
foreach
(
module_list
()
as
$module
)
{
if
(
module_hook
(
$module
,
"user"
))
{
$result
=
module_invoke
(
$module
,
"user"
,
"edit_validate"
,
$edit
,
$user
);
}
if
(
is_array
(
$result
))
{
$data
=
array_merge
(
$data
,
$result
);
}
elseif
(
is_string
(
$result
))
{
$error
=
$result
;
break
;
}
}
if
(
!
$error
)
{
/*
** Save user information:
...
...
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