Merge branch 'MDL-76185-311' of https://github.com/mihailges/moodle i…

…nto MOODLE_311_STABLE
moodle · Nov 9, 2022 · acdca03 · acdca03
2 parents dd6f0de + 0eda72e
commit acdca03
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/mod/glossary/formats/continuous/continuous_format.php b/mod/glossary/formats/continuous/continuous_format.php
@@ -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";

diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
@@ -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";
+        }
     }
 }