Merge branch 'MDL-38717-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 27 Mar 2013 03:57:14 +0000 (11:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 27 Mar 2013 03:57:14 +0000 (11:57 +0800)
1  2 
user/editlib.php

diff --combined user/editlib.php
@@@ -155,6 -155,7 +155,7 @@@ function useredit_shared_definition(&$m
      } else {
          $mform->addElement('text', 'email', get_string('email'), 'maxlength="100" size="30"');
          $mform->addRule('email', $strrequired, 'required', null, 'client');
+         $mform->setType('email', PARAM_NOTAGS);
      }
  
      $choices = array();
      $mform->setType('description_editor', PARAM_CLEANHTML);
      $mform->addHelpButton('description_editor', 'userdescription');
  
 -    if (!empty($CFG->gdversion) and empty($USER->newadminuser)) {
 +    if (empty($USER->newadminuser)) {
          $mform->addElement('header', 'moodle_picture', get_string('pictureofuser'));
  
          if (!empty($CFG->enablegravatar)) {