summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2004-05-05 21:17:25 +0000
committerDries Buytaert <dries@buytaert.net>2004-05-05 21:17:25 +0000
commit0e6221a192c704231405ae79cf924cdb3bc76f39 (patch)
treeefb0d6edb66b342945a6c970715d757cea505d3e
parent681b26febc6457cf2a532a2d45306bc52de165b4 (diff)
downloadbrdo-0e6221a192c704231405ae79cf924cdb3bc76f39.tar.gz
brdo-0e6221a192c704231405ae79cf924cdb3bc76f39.tar.bz2
- Patch #7585 by Gerhard: extra data added by profile.module to the user
object got saved in the user's data column even if there is a dedicated table for that information.
-rw-r--r--modules/profile.module6
-rw-r--r--modules/profile/profile.module6
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/profile.module b/modules/profile.module
index 0334445c8..b97d9b093 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -87,13 +87,13 @@ function profile_load_profile(&$user) {
}
}
-function profile_save_profile($edit, $user) {
+function profile_save_profile(&$edit, &$user) {
db_query('DELETE FROM {profile_values} WHERE uid = %d', $user->uid);
$result = db_query('SELECT fid, name FROM {profile_fields}');
while ($field = db_fetch_object($result)) {
if ($edit[$field->name]) {
db_query("INSERT INTO {profile_values} (fid, uid, value) VALUES (%d, %d, '%s')", $field->fid, $user->uid, $edit[$field->name]);
- unset($edit[$field->name]);
+ unset($edit[$field->name], $user->{$field->name});
}
}
}
@@ -194,7 +194,7 @@ function profile_validate_profile($edit) {
return $edit;
}
-function profile_user($type, $edit, &$user) {
+function profile_user($type, &$edit, &$user) {
switch ($type) {
case 'load':
return profile_load_profile($user);
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index 0334445c8..b97d9b093 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -87,13 +87,13 @@ function profile_load_profile(&$user) {
}
}
-function profile_save_profile($edit, $user) {
+function profile_save_profile(&$edit, &$user) {
db_query('DELETE FROM {profile_values} WHERE uid = %d', $user->uid);
$result = db_query('SELECT fid, name FROM {profile_fields}');
while ($field = db_fetch_object($result)) {
if ($edit[$field->name]) {
db_query("INSERT INTO {profile_values} (fid, uid, value) VALUES (%d, %d, '%s')", $field->fid, $user->uid, $edit[$field->name]);
- unset($edit[$field->name]);
+ unset($edit[$field->name], $user->{$field->name});
}
}
}
@@ -194,7 +194,7 @@ function profile_validate_profile($edit) {
return $edit;
}
-function profile_user($type, $edit, &$user) {
+function profile_user($type, &$edit, &$user) {
switch ($type) {
case 'load':
return profile_load_profile($user);