From 11342dbcf8afa985123a512e8d6b8eb381307721 Mon Sep 17 00:00:00 2001 From: Mihail Geshoski Date: Mon, 22 Jan 2018 13:51:58 +0800 Subject: [PATCH] MDL-60181 glossary: Glossary rating is displayed wrongly --- mod/glossary/formats/entrylist/entrylist_format.php | 5 +++-- mod/glossary/lib.php | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mod/glossary/formats/entrylist/entrylist_format.php b/mod/glossary/formats/entrylist/entrylist_format.php index 6a352485354..b1482f6793a 100644 --- a/mod/glossary/formats/entrylist/entrylist_format.php +++ b/mod/glossary/formats/entrylist/entrylist_format.php @@ -25,7 +25,7 @@ function glossary_show_entry_entrylist($course, $cm, $glossary, $entry, $mode='' } if (!empty($entry->rating)) { echo '
'; - echo ''; + echo ''; $return = glossary_print_entry_ratings($course, $entry); echo ''; } @@ -37,7 +37,8 @@ function glossary_show_entry_entrylist($course, $cm, $glossary, $entry, $mode='' } echo ''; - echo "\n"; + echo ""; + echo "
\n"; return $return; } diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index b3c9f9215d3..83ec65de81e 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -1329,7 +1329,6 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h $return .= '
'.$comment->output(true).'
'; $output = true; } - $return .= '
'; //If we haven't calculated any REAL thing, delete result ($return) if (!$output) { @@ -1373,11 +1372,12 @@ function glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $m echo ''.$icons.''; } if (!empty($entry->rating)) { - echo ''; + echo ''; glossary_print_entry_ratings($course, $entry); echo ''; } echo ''; + echo "
\n"; } }