Merge branch 'MDL-29012-show_deleted_field' of git://github.com/tmuras/moodle

lang/en/admin.php

@@ -804,7 +804,7 @@ $string['profiledefaultcategory'] = 'Other fields';
 $string['profiledefaultdata'] = 'Default value';
 $string['profiledefaultchecked'] = 'Checked by default';
 $string['profiledeletecategory'] = 'Deleting a category';
-$string['profiledeletefield'] = 'Deleting a field';
+$string['profiledeletefield'] = 'Deleting field "{$a}"';
 $string['profiledescription'] = 'Description of the field';
 $string['profiledscript'] = 'This script has been profiled';
 $string['profiledscriptview'] = 'View profiling information for this script';

user/profile/index.php

@@ -55,8 +55,9 @@ switch ($action) {
         }
 
         //ask for confirmation
+        $fieldname = $DB->get_field('user_info_field', 'name', array('id'=>$id));
         $optionsyes = array ('id'=>$id, 'confirm'=>1, 'action'=>'deletefield', 'sesskey'=>sesskey());
-        $strheading = get_string('profiledeletefield', 'admin');
+        $strheading = get_string('profiledeletefield', 'admin', $fieldname);
         $PAGE->navbar->add($strheading);
         echo $OUTPUT->header();
         echo $OUTPUT->heading($strheading);