diff options
| author | Dries Buytaert <dries@buytaert.net> | 2007-07-01 17:41:16 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2007-07-01 17:41:16 +0000 |
| commit | e59852d336467e7269853724a28d80bc070bcbf6 (patch) | |
| tree | 5be53c3b52d923476e8be517f15251f1487efa9c /modules/profile | |
| parent | c11cb4ec24479e801076c094f043f2084b344d0c (diff) | |
| download | brdo-e59852d336467e7269853724a28d80bc070bcbf6.tar.gz brdo-e59852d336467e7269853724a28d80bc070bcbf6.tar.bz2 | |
- Rollback of patch #147723: delete API. Talked to Steven and Gabor and we
unanimously agreed to rollback the deletion API. We all support the
features this patch added, yet not its actual design and implementation.
After some talk, we decided that it would be better for Drupal -- in the
long term -- not to go with a solution that isn't 100%. We also recognize
that in the short term, this patch would have been useful addition. So
let's figure out how we can implement this properly in D7.
Diffstat (limited to 'modules/profile')
| -rw-r--r-- | modules/profile/profile.module | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/profile/profile.module b/modules/profile/profile.module index 74a27513d..66ab22967 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -398,10 +398,10 @@ function profile_field_delete(&$form_state, $fid) { $form['fid'] = array('#type' => 'value', '#value' => $fid); $form['title'] = array('#type' => 'value', '#value' => $field->title); - $options = array('description' => 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/user/profile/edit/'. $fid)))); - return confirm_form($form, - t('Are you sure you want to delete the field %field?', array('%field' => $field->title)), 'admin/user/profile', $options); + t('Are you sure you want to delete the field %field?', array('%field' => $field->title)), 'admin/user/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/user/profile/edit/'. $fid))), + t('Delete'), t('Cancel')); } /** |