| Index: trunk/extensions/Poll/Poll_body.php |
| — | — | @@ -150,7 +150,7 @@ |
| 151 | 151 | if($alternative_4 != "") { $wgOut->addHtml( '<tr><td>'.Xml::radio('vote', '4').' '.$alternative_4.'</td></tr>' ); } |
| 152 | 152 | if($alternative_5 != "") { $wgOut->addHtml( '<tr><td>'.Xml::radio('vote', '5').' '.$alternative_5.'</td></tr>' ); } |
| 153 | 153 | if($alternative_6 != "") { $wgOut->addHtml( '<tr><td>'.Xml::radio('vote', '6').' '.$alternative_6.'</td></tr>' ); } |
| 154 | | - $wgOut->addHtml( '<tr><td>'.wfMsg( 'poll-vote-other' ).'</td><td>'.Xml::input('vote_other').'</td></tr>' ); |
| | 154 | + $wgOut->addHtml( '<tr><td>'.wfMsg( 'poll-vote-other' ).' '.Xml::input('vote_other').'</td></tr>' ); |
| 155 | 155 | } |
| 156 | 156 | if( $multi == 1 ) { |
| 157 | 157 | $wgOut->addHtml( '<tr><td>'.Xml::check('vote_1').' '.$alternative_1.'</td></tr>' ); |
| — | — | @@ -158,9 +158,10 @@ |
| 159 | 159 | if($alternative_3 != "") { $wgOut->addHtml( '<tr><td>'.Xml::check('vote_3').' '.$alternative_3.'</td></tr>' ); } |
| 160 | 160 | if($alternative_4 != "") { $wgOut->addHtml( '<tr><td>'.Xml::check('vote_4').' '.$alternative_4.'</td></tr>' ); } |
| 161 | 161 | if($alternative_5 != "") { $wgOut->addHtml( '<tr><td>'.Xml::check('vote_5').' '.$alternative_5.'</td></tr>' ); } |
| 162 | | - if($alternative_6 != "") { $wgOut->addHtml( '<tr><td>'.Xml::check('vote_6').' '.$alternative_6.'</td></tr>' ); } |
| | 162 | + if($alternative_6 != "") { $wgOut->addHtml( '<tr><td>'.Xml::check('vote_6').' '.$alternative_6.'</td></tr>' ); } |
| | 163 | + $wgOut->addHtml( '<tr><td>'.wfMsg( 'poll-vote-other' ).' '.Xml::input('vote_other').'</td></tr>' ); |
| 163 | 164 | } |
| 164 | | - $wgOut->addHtml( '<tr><td>'.Xml::submitButton(wfMsg( 'poll-submit' )).''.Xml::hidden('type', 'vote').''.Xml::hidden('multi', $multi).'</td><td><a href="'.$this->getTitle()->getFullURL( 'action=score&id='.$vid ).'">'.wfMsg( 'poll-title-score' ).'</a></td></tr>' ); |
| | 165 | + $wgOut->addHtml( '<tr><td>'.Xml::submitButton(wfMsg( 'poll-submit' )).''.Xml::hidden('type', 'vote').''.Xml::hidden('multi', $multi).' <a href="'.$this->getTitle()->getFullURL( 'action=score&id='.$vid ).'">'.wfMsg( 'poll-title-score' ).'</a></td></tr>' ); |
| 165 | 166 | $wgOut->addHtml( '<tr><td>' ); |
| 166 | 167 | $wgOut->addWikiText( '<small>'.wfMsg( 'poll-score-created', $creater ).'</small>' ); |
| 167 | 168 | $wgOut->addHtml( '</td></tr>' ); |
| — | — | @@ -249,7 +250,7 @@ |
| 250 | 251 | } |
| 251 | 252 | $score_other_out = ""; |
| 252 | 253 | foreach($score_other as $name => $value) { |
| 253 | | - $score_other_out .= '<tr><td>'.$name.'</td><td>'.$value['number'].'</td></tr>'; |
| | 254 | + $score_other_out .= '<tr><td>'.htmlentities( $name, ENT_QUOTES, 'UTF-8' ).'</td><td>'.htmlentities( $value['number'], ENT_QUOTES, 'UTF-8' ).'</td></tr>'; |
| 254 | 255 | } |
| 255 | 256 | |
| 256 | 257 | $wgOut->addHtml( Xml::openElement( 'table' ) ); |
| — | — | @@ -260,7 +261,7 @@ |
| 261 | 262 | if($alternative_4 != "") { $wgOut->addHtml( '<tr><td>'.$alternative_4.'</td><td>'.$query_num_4.'</td></tr>' ); } |
| 262 | 263 | if($alternative_5 != "") { $wgOut->addHtml( '<tr><td>'.$alternative_5.'</td><td>'.$query_num_5.'</td></tr>' ); } |
| 263 | 264 | if($alternative_6 != "") { $wgOut->addHtml( '<tr><td>'.$alternative_6.'</td><td>'.$query_num_6.'</td></tr>' ); } |
| 264 | | - if($score_other_out != "") { $wgOut->addHtml( '<tr><td colspan="2">'.wfMsg( 'poll-vote-other' ).'</td></tr>'. $score_other_out ); } |
| | 265 | + if($score_other_out != "") { $wgOut->addHtml( '<tr><td colspan="2">'.wfMsg( 'poll-vote-other' ).' </td></tr>'. $score_other_out ); } |
| 265 | 266 | $wgOut->addHtml( '<tr><td>' ); |
| 266 | 267 | $wgOut->addWikiText( '<small>'.wfMsg( 'poll-score-created', $creater ).'</small>' ); |
| 267 | 268 | $wgOut->addHtml( '</td></tr>' ); |
| Index: trunk/extensions/Poll/Poll.i18n.php |
| — | — | @@ -57,7 +57,7 @@ |
| 58 | 58 | 'poll-no-dis' => 'No Description!', |
| 59 | 59 | 'poll-create-allow-more' => 'Allow Multi-Vote', |
| 60 | 60 | 'poll-vote-changed' => 'Vote has been changed!', |
| 61 | | - 'poll-vote-other' => 'Other answers: ', |
| | 61 | + 'poll-vote-other' => 'Other answers:', |
| 62 | 62 | 'poll-ip-error' => 'Unregistered person can not vote at this poll!', |
| 63 | 63 | 'poll-create-allow-ip' => 'Allow unregistered users to vote', |
| 64 | 64 | ); |
| — | — | @@ -111,7 +111,7 @@ |
| 112 | 112 | 'poll-no-dis' => 'Keine Beschreibung vorhanden!', |
| 113 | 113 | 'poll-create-allow-more' => 'Mehfachabstimmung erlaubt', |
| 114 | 114 | 'poll-vote-changed' => 'Stimme wurde geändert!', |
| 115 | | - 'poll-vote-other' => 'Andere Antworten: ', |
| 116 | | - 'poll-ip-error' => 'Nicht regestrierte Benutzer können bei dieser Umfrage nicht abstimmen!', |
| | 115 | + 'poll-vote-other' => 'Andere Antworten:', |
| | 116 | + 'poll-ip-error' => 'Nicht registrierte Benutzer können bei dieser Umfrage nicht abstimmen!', |
| 117 | 117 | 'poll-create-allow-ip' => 'Erlaube nicht registrierten Benutzer abzustimmen', |
| 118 | 118 | ); |