--- db/prgsrc/db.cgi	2004/11/21 13:37:29	1.138
+++ db/prgsrc/db.cgi	2005/02/26 11:03:41	1.139
@@ -904,7 +904,7 @@ sub PrintList {
 	for (my $i = $first; $i <= $last; $i++) {
 		my $q=$q{$$Questions[$i-1]};
 	        my $output;
-		$output = &PrintQuestion($dbh, $q, 1, 0, 1,0,1  );
+		$output = &PrintQuestion($dbh, $q, 1, 0, 1,$text,1  );
 #                if (param('metod') && (param('metod') eq 'rus' || param('metod') eq 'proxy'))
                 {
 	             $output=~s/\b($shablon)\b/\<strong\>$1\<\/strong\>/gi;
@@ -1278,7 +1278,7 @@ sub PrintTour {
 	my $sth=SelectQuestions($dbh,\@Questions,0);
 	for ($q = 0; $q <= $#Questions; $q++) {
 		fetchquestion($sth,\%q,0);
-		$output .= &PrintQuestion($dbh, \%q, $answer, 0,0,0,1);
+		$output .= &PrintQuestion($dbh, \%q, $answer, 0,0,$text,1);
 	}
 	$sth->finish;
 	$output .= hr({-'align'=>'center', -'width'=>'80%'});
@@ -1499,6 +1499,9 @@ $output.="</span>"
 
 	}
 	$output=~s/\(pic: ([^\)]*)\)/<p><img src="\/znatoki\/images\/db\/$1"><p>/g unless $text;
+	$output=~s/›/\&iuml;/g;
+	$output=~s/“/\&Iuml;/g;
+
 	$paramtour||=param("tour");
 	$fname=$fname.".$Question{'TourNumber'}" if $fname && $Question{'TourNumber'};
 $fname||=param('tour');
@@ -2229,7 +2232,7 @@ EOT
 		  $QuestionNumber=($sth->fetchrow)[0]||0;
 	        }
 	        if ($QuestionNumber) {
-		  $globaloutput.= &PrintQuestion($dbh, $QuestionNumber, $withanswers||0, $qnum, 1,0,0);
+		  $globaloutput.= &PrintQuestion($dbh, $QuestionNumber, $withanswers||0, $qnum, 1,$text,0);
 #                                        $dbh, $Id, $answer, $qnum, $title, $text
 		} else  {
   		   $globaloutput.=&PrintTournament($dbh, $tour, $withanswers);