mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 13:38:32 +01:00
Code Issues Projects Releases Wiki Activity

MDL-55491 badges: Add missing format_string call

Browse Source 
Extra version bump + trailing whitespace removal.
This commit is contained in:
David Monllao 2018-04-11 17:55:45 +02:00
parent 728b851eb5
commit 27fef51d48
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
badges/criteria/award_criteria_cohort.php
View File

@ -61,7 +61,7 @@ class award_criteria_cohort extends award_criteria {
if (!$cohortname) {
$str = $OUTPUT->error_text(get_string('error:nosuchcohort', 'badges'));
} else {
$str = html_writer::tag('b', '"' . $cohortname . '"');
$str = html_writer::tag('b', '"' . format_string($cohortname, true) . '"');
}
$output[] = $str;
}

4
badges/tests/behat/criteria_cohort.feature
View File

@ -166,7 +166,7 @@ Feature: Award badges based on cohort
And I log in as "user2"
And I follow "Profile" in the user menu
And I should not see "Site Badge"
@javascript
Scenario: Award badge based on a single cohort membership or other criteria.
Given the following "cohorts" exist:
@ -222,7 +222,7 @@ Feature: Award badges based on cohort
And I log in as "user3"
And I follow "Profile" in the user menu
And I should not see "Site Badge"
@javascript
Scenario: Award badge based on a multiple cohort membership or other criteria.
Given the following "cohorts" exist:

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2018040500.02; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2018040500.03; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.