mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-05-13 19:56:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-12689_master' of https://github.com/markn86/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2017-04-05 11:13:31 +08:00
commit e31dba2c8d
4 changed files with 5 additions and 5 deletions
admin
auth_config.php
lib/classes
user.php
mod
forum
upgrade.txt
quiz/report
upgrade.txt

4
admin/auth_config.php

@ -16,7 +16,7 @@ $err = array();
$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageauths";
debugging("Use of config.html files in authentication plugins have been depreciated. " .
debugging("Use of config.html files in authentication plugins have been deprecated. " .
" Please migrate your plugin to use the admin settings API", DEBUG_DEVELOPER);
// save configuration changes
@ -107,7 +107,7 @@ exit;
*/
function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts, $updateopts, $customfields = array()) {
global $DB, $OUTPUT;
debugging("The function 'print_auth_lock_options' has been depreciated, " .
debugging("The function 'print_auth_lock_options' has been deprecated, " .
"Please migrate your code to use the admin settings API and use the function 'display_auth_lock_options' instead. ",
DEBUG_DEVELOPER);

2
lib/classes/user.php

@ -27,7 +27,7 @@ defined('MOODLE_INTERNAL') || die();
/**
* User class to access user details.
*
* @todo move api's from user/lib.php and depreciate old ones.
* @todo move api's from user/lib.php and deprecate old ones.
* @package core
* @copyright 2013 Rajesh Taneja <rajesh@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later

2
mod/forum/upgrade.txt

@ -97,7 +97,7 @@ information provided here is intended especially for developers.
* The function forum_shorten_post() has been deprecated. It was doing a poor
job of shortening forum post text and the shorten_text() function does a
much better job.
* The constant FORUM_TRACKING_ON has been depreciated and replaced by
* The constant FORUM_TRACKING_ON has been deprecated and replaced by
FORUM_TRACKING_FORCED. The value between them is maintained, so they are
interchangeable, but code should migrate to the new name.

2
mod/quiz/report/upgrade.txt

@ -14,7 +14,7 @@ methods now includes '$studentsjoins', rather than '$students' and similar
for '$groupstudentsjoins', '$allowedjoins' and '$usersjoins'. For clear
examples of the use of these changes please see attemptsreport_table.php
base_sql() or almost any function in overview/report.php. The protected
function quiz_attempts_report::load_relevant_students is depreciated,
function quiz_attempts_report::load_relevant_students is deprecated,
please use quiz_attempts_report::get_students_joins() instead.
=== 2.6 ===