place pronunciation on one line in the default script (issue 372)

This commit is contained in:
justin 2010-07-13 19:46:51 +00:00
parent 39c402f3f5
commit 8a16a90c0e

View File

@ -249,9 +249,9 @@ if(!$scriptformat) $scriptformat="default";
if($studnum>0) $students.=", "; if($studnum>0) $students.=", ";
$students.="$studentinfo->firstname $studentinfo->lastname"; $students.="$studentinfo->firstname $studentinfo->lastname";
if($studnum>0) $pronounce .= ", "; if($studentinfo->pronunciation) {
$pronounce .= "\"{$studentinfo->pronunciation}\""; $students .= " (Pronounced \"{$studentinfo->pronunciation}\")";
$rawpronounce .= "{$studentinfo->pronunciation}"; }
$student_winner[$studnum] = "$studentinfo->firstname $studentinfo->lastname"; $student_winner[$studnum] = "$studentinfo->firstname $studentinfo->lastname";
$student_win_pronunc[$studnum] = "$studentinfo->pronunciation"; $student_win_pronunc[$studnum] = "$studentinfo->pronunciation";
@ -261,8 +261,6 @@ if(!$scriptformat) $scriptformat="default";
if($scriptformat=="default") { if($scriptformat=="default") {
$rep->addText($students); $rep->addText($students);
if(trim($rawpronounce) != "" && $show_pronunciation == TRUE)
$rep->addText(" Pronunciation: $pronounce");
$rep->addText(" School: {$student_school[0]}"); $rep->addText(" School: {$student_school[0]}");
} }
if($scriptformat=="formatted") { if($scriptformat=="formatted") {