moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-64570-35-fix1' of git://github.com/damyon/moodle into MOODLE_35_STABLE

Browse source
This commit is contained in:
Andrew Nicols 2019-02-20 10:55:32 +08:00
commit 6fb045026e
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
user/lib.php
View file

@ -1543,11 +1543,8 @@ function user_edit_map_field_purpose($userid, $fieldname) {
);
$purpose = '';
if (!$currentuser) {
// Do not set a purpose.
$purpose = '';
}
if (isset($validmappings[$fieldname])) {
// Only set a purpose when editing your own user details.
if ($currentuser && isset($validmappings[$fieldname])) {
$purpose = ' autocomplete="' . $validmappings[$fieldname] . '" ';
}

4
user/tests/behat/behat_user.php
View file

@ -27,6 +27,8 @@
require_once(__DIR__ . '/../../../lib/behat/behat_base.php');
use Behat\Mink\Exception\ExpectationException as ExpectationException;
/**
* Steps definitions for users.
*
@ -83,7 +85,7 @@ class behat_user extends behat_base {
$value = $fld->get_attribute('autocomplete');
if ($value == $purpose) {
throw new ExpectationException('The "' . $field . '" field does have purposea "' . $purpose . '"', $this->getSession());
throw new ExpectationException('The "' . $field . '" field does have purpose "' . $purpose . '"', $this->getSession());
}
}
}