# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
Index: moodle/admin/uploadpicture.php
--- moodle/admin/uploadpicture.php Base (1.1.2.4)
+++ moodle/admin/uploadpicture.php Locally Modified (Based On 1.1.2.4)
@@ -63,7 +63,7 @@
 admin_externalpage_print_header();
 print_heading_with_help($struploadpictures, 'uploadpictures');
 
-$mform = new admin_uploadpicture_form();
+$mform = new admin_uploadpicture_form(null, $userfields);
 if ($formdata = $mform->get_data()) {
     if (!array_key_exists($userfield, $userfields)) {
         notify(get_string('uploadpicture_baduserfield','admin'));
Index: moodle/admin/uploadpicture_form.php
--- moodle/admin/uploadpicture_form.php Base (1.1.2.1)
+++ moodle/admin/uploadpicture_form.php Locally Modified (Based On 1.1.2.1)
@@ -4,7 +4,6 @@
     class admin_uploadpicture_form extends moodleform {
         function definition (){
             global $CFG, $USER;
-            global $userfields;
     
             $mform =& $this->_form;
     
@@ -15,7 +14,7 @@
             $mform->addElement('file', 'userpicturesfile', get_string('file'), 'size="40"');
             $mform->addRule('userpicturesfile', null, 'required');
     
-            $choices = $userfields;
+            $choices =& $this->_customdata;
             $mform->addElement('select', 'userfield', get_string('uploadpicture_userfield', 'admin'), $choices);
             $mform->setType('userfield', PARAM_INT);