diff --git a/public/main/exercise/MatchingDraggable.php b/public/main/exercise/MatchingDraggable.php index eb6f8eb788..ab8f67836e 100644 --- a/public/main/exercise/MatchingDraggable.php +++ b/public/main/exercise/MatchingDraggable.php @@ -260,15 +260,13 @@ class MatchingDraggable extends Question ]) ) { $header .= ''.get_lang('Your choice').''; - } - - if ($exercise->showExpectedChoice()) { if ($exercise->showExpectedChoiceColumn()) { $header .= ''.get_lang('Expected choice').''; } + } + + if ($exercise->showExpectedChoice()) { $header .= ''.get_lang('Status').''; - } else { - $header .= ''.get_lang('Corresponds to').''; } $header .= ''; diff --git a/public/main/exercise/matching.class.php b/public/main/exercise/matching.class.php index 4597b7d984..2b615068ea 100644 --- a/public/main/exercise/matching.class.php +++ b/public/main/exercise/matching.class.php @@ -279,17 +279,13 @@ class Matching extends Question ]) ) { $header .= ''.get_lang('Your choice').''; - //if ($exercise->showExpectedYour choiceColumn()) { - //$header .= ''.get_lang('ExpectedYour choice').''; - //} + if ($exercise->showExpectedChoiceColumn()) { + $header .= ''.get_lang('Expected choice').''; + } } if ($exercise->showExpectedChoice()) { $header .= ''.get_lang('Status').''; - } else { - if ($exercise->showExpectedChoiceColumn()) { - $header .= ''.get_lang('Corresponds to').''; - } } $header .= '';