Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #24678 by jmengle, DriesK, Richard et al: bugfix: deleting a profile field doesn't delete values in profile_values table.

4.7.x
Dries Buytaert 2006-01-08 12:06:13 +00:00
parent ef0e3ffb44
commit 68ced8da59
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/profile.module
View File

@ -551,14 +551,18 @@ function profile_admin_delete($fid) {
$field = db_fetch_object(db_query("SELECT title FROM {profile_fields} WHERE fid = %d", $fid)); $field = db_fetch_object(db_query("SELECT title FROM {profile_fields} WHERE fid = %d", $fid));
if ($_POST['edit']['confirm']) { if ($_POST['edit']['confirm']) {
db_query('DELETE FROM {profile_fields} WHERE fid = %d', $fid); db_query('DELETE FROM {profile_fields} WHERE fid = %d', $fid);
db_query('DELETE FROM {profile_values} WHERE fid = %d', $fid);
cache_clear_all(); cache_clear_all();
drupal_set_message(t('The field %field has been deleted.', array('%field' => theme('placeholder', $field->title)))); drupal_set_message(t('The field %field has been deleted.', array('%field' => theme('placeholder', $field->title))));
drupal_goto('admin/settings/profile'); drupal_goto('admin/settings/profile');
} }
else { else {
return confirm_form('profile_confirm_delete', $form, t('Do you want to remove the field %field?', return confirm_form('profile_confirm_delete', $form,
array('%field' => $field->title)), t('Are you sure you want to delete the field %field?', array('%field' => theme('placeholder', $field->title))),
'admin/settings/profile', '', t('Delete'), t('Cancel')); 'admin/settings/profile',
t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to <a href="%edit-field">edit this field</a> and change it to a \'hidden profile field\' so that it may only be accessed by administrators.', array('%edit-field' => url('admin/settings/profile/edit/' . $fid))),
t('Delete'),
t('Cancel'));
} }
} }

10
modules/profile/profile.module
View File

@ -551,14 +551,18 @@ function profile_admin_delete($fid) {
$field = db_fetch_object(db_query("SELECT title FROM {profile_fields} WHERE fid = %d", $fid)); $field = db_fetch_object(db_query("SELECT title FROM {profile_fields} WHERE fid = %d", $fid));
if ($_POST['edit']['confirm']) { if ($_POST['edit']['confirm']) {
db_query('DELETE FROM {profile_fields} WHERE fid = %d', $fid); db_query('DELETE FROM {profile_fields} WHERE fid = %d', $fid);
db_query('DELETE FROM {profile_values} WHERE fid = %d', $fid);
cache_clear_all(); cache_clear_all();
drupal_set_message(t('The field %field has been deleted.', array('%field' => theme('placeholder', $field->title)))); drupal_set_message(t('The field %field has been deleted.', array('%field' => theme('placeholder', $field->title))));
drupal_goto('admin/settings/profile'); drupal_goto('admin/settings/profile');
} }
else { else {
return confirm_form('profile_confirm_delete', $form, t('Do you want to remove the field %field?', return confirm_form('profile_confirm_delete', $form,
array('%field' => $field->title)), t('Are you sure you want to delete the field %field?', array('%field' => theme('placeholder', $field->title))),
'admin/settings/profile', '', t('Delete'), t('Cancel')); 'admin/settings/profile',
t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to <a href="%edit-field">edit this field</a> and change it to a \'hidden profile field\' so that it may only be accessed by administrators.', array('%edit-field' => url('admin/settings/profile/edit/' . $fid))),
t('Delete'),
t('Cancel'));
} }
} }