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

DML-53048 forms: Remove conflict resultion remaining bit

Browse source 
Change wrong alternative references as well.
This commit is contained in:
David Monllao 2016-10-24 11:16:53 +08:00
parent 8f68e0343a
commit 80b74762c9
3 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/deprecatedlib.php
View file

@ -5620,7 +5620,6 @@ function message_is_user_blocked($recipient, $sender = null) {
} }
/** /**
<<<<<<< 919b9dfabd69f71c088f565746c547e6e169a0b7
* Display logs. * Display logs.
* *
* @deprecated since 3.2 * @deprecated since 3.2

2
lib/form/yui/build/moodle-form-passwordunmask/moodle-form-passwordunmask-debug.js vendored
View file

@ -3,7 +3,7 @@ YUI.add('moodle-form-passwordunmask', function (Y, NAME) {
M.form = M.form || {}; M.form = M.form || {};
M.form.passwordunmask = function() { M.form.passwordunmask = function() {
Y.log("The moodle-form-passwordunmask module has been deprecated. " + Y.log("The moodle-form-passwordunmask module has been deprecated. " +
"Please use the core_forum/passwordunmask amd module instead.", 'moodle-form-passwordunmask', 'warn'); "Please use the core_form/passwordunmask amd module instead.", 'moodle-form-passwordunmask', 'warn');
}; };

2
lib/form/yui/src/passwordunmask/js/passwordunmask.js vendored
View file

@ -1,5 +1,5 @@
M.form = M.form || {}; M.form = M.form || {};
M.form.passwordunmask = function() { M.form.passwordunmask = function() {
Y.log("The moodle-form-passwordunmask module has been deprecated. " + Y.log("The moodle-form-passwordunmask module has been deprecated. " +
"Please use the core_forum/passwordunmask amd module instead.", 'moodle-form-passwordunmask', 'warn'); "Please use the core_form/passwordunmask amd module instead.", 'moodle-form-passwordunmask', 'warn');
}; };