Merge branch 'MDL-76185-master' of https://github.com/mihailges/moodle

This commit is contained in:
Jun Pataleta 2022-11-09 21:51:17 +08:00
commit 5548743ece
2 changed files with 8 additions and 3 deletions

View File

@ -22,7 +22,7 @@ function glossary_show_entry_continuous($course, $cm, $glossary, $entry, $mode='
echo '</td></tr>';
echo '<tr valign="top"><td class="entrylowersection">';
glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $mode, $hook, $printicons, $aliases);
glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $mode, $hook, $printicons, $aliases, false);
echo '</td>';
echo '</tr>';
echo "</table>\n";

View File

@ -1354,9 +1354,11 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h
* @param object $hook
* @param bool $printicons
* @param bool $aliases
* @param bool $printseparator Whether to print a thematic break (separator) at the end of the lower section.
* @return void
*/
function glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $mode, $hook, $printicons, $aliases=true) {
function glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $mode, $hook, $printicons, $aliases = true,
$printseparator = true) {
if ($aliases) {
$aliases = glossary_print_entry_aliases($course, $cm, $glossary, $entry, $mode, $hook,'html');
}
@ -1381,7 +1383,10 @@ function glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $m
echo '</td></tr>';
}
echo '</table>';
echo "<hr>\n";
if ($printseparator) {
echo "<hr>\n";
}
}
}