Merge branch 'MDL-50269_master' of git://github.com/markn86/moodle

Conflicts:
	lib/upgrade.txt
This commit is contained in:
David Monllao 2015-12-02 15:54:25 +08:00 committed by Eloy Lafuente (stronk7)
commit 200ab5266a
6 changed files with 24 additions and 16 deletions

View file

@ -901,9 +901,10 @@ function print_container_end($return=false) {
/**
* Print a bold message in an optional color.
*
* @deprecated use $OUTPUT->notification instead.
* @deprecated since Moodle 2.0 MDL-12345 - use $OUTPUT->notification instead.
* @todo MDL-50469 This will be deleted in Moodle 3.3.
* @param string $message The message to print out
* @param string $style Optional style to display message text in
* @param string $classes Optional style to display message text in
* @param string $align Alignment option
* @param bool $return whether to return an output string or echo now
* @return string|bool Depending on $result
@ -911,6 +912,8 @@ function print_container_end($return=false) {
function notify($message, $classes = 'notifyproblem', $align = 'center', $return = false) {
global $OUTPUT;
debugging('notify() is deprecated, please use $OUTPUT->notification() instead', DEBUG_DEVELOPER);
if ($classes == 'green') {
debugging('Use of deprecated class name "green" in notify. Please change to "notifysuccess".', DEBUG_DEVELOPER);
$classes = 'notifysuccess'; // Backward compatible with old color system

View file

@ -7,6 +7,7 @@ information provided here is intended especially for developers.
<frankenstyle>_extend_navigation_user(navigation_node $parentnode, stdClass $user,
context_user $context, stdClass $course,
context_course $coursecontext)
* The function notify() now throws a debugging message - see MDL-50269.
=== 3.0 ===