Skip to content

Commit

Permalink
MDL-48115 badges: Fix strtoupper() output in badges
Browse files Browse the repository at this point in the history
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
  • Loading branch information
Yuliya Bozhko committed Nov 11, 2014
1 parent 683d7de commit ae17e38
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion badges/criteria/award_criteria.php
Expand Up @@ -223,7 +223,7 @@ public function config_form_criteria($data) {
if (!empty($this->params)) {
if (count($this->params) > 1) {
echo $OUTPUT->box(get_string('criteria_descr_' . $this->criteriatype, 'badges',
strtoupper($agg[$data->get_aggregation_method($this->criteriatype)])), array('clearfix'));
core_text::strtoupper($agg[$data->get_aggregation_method($this->criteriatype)])), array('clearfix'));
} else {
echo $OUTPUT->box(get_string('criteria_descr_single_' . $this->criteriatype , 'badges'), array('clearfix'));
}
Expand Down
2 changes: 1 addition & 1 deletion badges/criteria/award_criteria_overall.php
Expand Up @@ -60,7 +60,7 @@ public function config_form_criteria($data) {
echo html_writer::table($table);
} else {
echo $OUTPUT->box(get_string('criteria_descr_' . $this->criteriatype, 'badges',
strtoupper($agg[$data->get_aggregation_method()])), 'clearfix');
core_text::strtoupper($agg[$data->get_aggregation_method()])), 'clearfix');
}
echo $OUTPUT->box_end();
}
Expand Down
6 changes: 3 additions & 3 deletions badges/renderer.php
Expand Up @@ -362,7 +362,7 @@ protected function render_issued_badge(issued_badge $ibadge) {
$items[] = get_string('criteria_descr_single_' . $type , 'badges') . $c->get_details();
} else {
$items[] = get_string('criteria_descr_' . $type , 'badges',
strtoupper($agg[$badge->get_aggregation_method($type)])) . $c->get_details();
core_text::strtoupper($agg[$badge->get_aggregation_method($type)])) . $c->get_details();
}
}
}
Expand Down Expand Up @@ -716,7 +716,7 @@ public function print_badge_criteria(badge $badge, $short = '') {
}
} else {
$output .= get_string('criteria_descr_' . $short . BADGE_CRITERIA_TYPE_OVERALL, 'badges',
strtoupper($agg[$badge->get_aggregation_method()]));
core_text::strtoupper($agg[$badge->get_aggregation_method()]));
}
$items = array();
unset($badge->criteria[BADGE_CRITERIA_TYPE_OVERALL]);
Expand All @@ -725,7 +725,7 @@ public function print_badge_criteria(badge $badge, $short = '') {
$items[] = get_string('criteria_descr_single_' . $short . $type , 'badges') . $c->get_details($short);
} else {
$items[] = get_string('criteria_descr_' . $short . $type , 'badges',
strtoupper($agg[$badge->get_aggregation_method($type)])) . $c->get_details($short);
core_text::strtoupper($agg[$badge->get_aggregation_method($type)])) . $c->get_details($short);
}
}
$output .= html_writer::alist($items, array(), 'ul');
Expand Down

0 comments on commit ae17e38

Please sign in to comment.