randomsamatch question type does not display images which are contained in the text of the short-answer questions it uses

diagnostic
ransomsamatch question type "Extends 'match' as there are quite a few simularities...", but there is a problem
in question/type/match/questiontype.php function print_question_formulation_and_controls(&$question, &$state, $cmoptions, $options)
line 287
$text = quiz_rewrite_question_urls($subquestion->questiontext, 'pluginfile.php', $context->id, 'qtype_match', 'subquestion', array($state->attempt, $state->question), $subquestion->id);
should be re-written as:
$text = quiz_rewrite_question_urls($subquestion->questiontext, 'pluginfile.php', $context->id, 'question', 'questiontext', array($state->attempt, $state->question), $subquestion->id);

the only solution I see at this stage is to NOT rely on the match function print_question_formulation_and_controls() but to re-write that function inside of question/type/randomsamatch/questiontype.php, with the correction mentioned above: 'question', 'questiontext'...

Tested successfully on Moodle 2.0.4+ (Build: 20110916).

NOTE: this does not apply to moodle 1.9 since - unfortunately - it is not possible to use images in a match question in that moodle version (except with a workaround)