MDL-55491 badges: Add missing format_string call

Extra version bump + trailing whitespace removal.

diff --git a/badges/criteria/award_criteria_cohort.php b/badges/criteria/award_criteria_cohort.php
index e49ceab..1e0bb80 100644 (file)
--- a/badges/criteria/award_criteria_cohort.php
+++ b/badges/criteria/award_criteria_cohort.php
@@ -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;
         }

diff --git a/badges/tests/behat/criteria_cohort.feature b/badges/tests/behat/criteria_cohort.feature
index 323cf4d..6f5f816 100644 (file)
--- a/badges/tests/behat/criteria_cohort.feature
+++ b/badges/tests/behat/criteria_cohort.feature
@@ -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:

diff --git a/version.php b/version.php
index 5c6af2e..760e7be 100644 (file)
--- a/version.php
+++ b/version.php
@@ -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.