Merge branch 'w36_MDL-29014_m22_str' of git://github.com/skodak/moodle

This commit is contained in:
Sam Hemelryk 2011-09-13 12:45:34 +12:00
commit 62b214d9a6
10 changed files with 22 additions and 22 deletions

View file

@ -3264,11 +3264,11 @@ function make_editing_buttons(stdClass $mod, $absolute = true, $moveselect = tru
function course_format_name ($course,$max=100) {
$str = $course->shortname.': '. $course->fullname;
if (strlen($str) <= $max) {
if (textlib::strlen($str) <= $max) {
return $str;
}
else {
return substr($str,0,$max-3).'...';
return textlib::substr($str,0,$max-3).'...';
}
}

View file

@ -181,8 +181,8 @@ function print_mnet_log_selector_form($hostid, $course, $selecteduser=0, $select
}
$section = $mod->section;
$mod->name = strip_tags(format_string($mod->name, true));
if (strlen($mod->name) > 55) {
$mod->name = substr($mod->name, 0, 50)."...";
if (textlib::strlen($mod->name) > 55) {
$mod->name = textlib::substr($mod->name, 0, 50)."...";
}
if (!$mod->visible) {
$mod->name = "(".$mod->name.")";
@ -394,8 +394,8 @@ function print_log_selector_form($course, $selecteduser=0, $selecteddate='today'
}
$section = $mod->section;
$mod->name = strip_tags(format_string($mod->name, true));
if (strlen($mod->name) > 55) {
$mod->name = substr($mod->name, 0, 50)."...";
if (textlib::strlen($mod->name) > 55) {
$mod->name = textlib::substr($mod->name, 0, 50)."...";
}
if (!$mod->visible) {
$mod->name = "(".$mod->name.")";