Index: printanswers.php =================================================================== --- printanswers.php (revision 10920) +++ printanswers.php (working copy) @@ -224,7 +224,7 @@ { if(isset($_POST['printableexport'])) { - $pdf->intopdf(FlattenText($fname[0].$fname[1],true).": ".$fname[2]); + $pdf->intopdf(FlattenText(tokenReplace($fname[0].$fname[1]),true).": ".$fname[2]); $pdf->ln(2); } else Index: admin/printablesurvey.php =================================================================== --- admin/printablesurvey.php (revision 10920) +++ admin/printablesurvey.php (working copy) @@ -779,7 +779,7 @@ $question = array( 'QUESTION_NUMBER' => $total_questions // content of the question code field ,'QUESTION_CODE' => $deqrow['title'] - ,'QUESTION_TEXT' => preg_replace('/(?:
|<\/(?:p|h[1-6])>)$/is' , '' , $deqrow['question']) // content of the question field + ,'QUESTION_TEXT' => preg_replace('/(?:
|<\/(?:p|h[1-6])>)$/is' , '' , tokenReplace($deqrow['question'])) // content of the question field ,'QUESTION_SCENARIO' => $explanation // if there are conditions on a question, list the conditions. ,'QUESTION_MANDATORY' => '' // translated 'mandatory' identifier ,'QUESTION_ID' => $deqrow['qid'] // id to be added to wrapping question div