| Index: trunk/phase3/includes/specials/SpecialUserrights.php |
| — | — | @@ -498,9 +498,13 @@ |
| 499 | 499 | $ret .= "\t<td style='vertical-align:top;'>\n"; |
| 500 | 500 | foreach( $column as $group => $checkbox ) { |
| 501 | 501 | $attr = $checkbox['disabled'] ? array( 'disabled' => 'disabled' ) : array(); |
| 502 | | - $text = $checkbox['irreversible'] |
| 503 | | - ? wfMsgHtml( 'userrights-irreversible-marker', User::getGroupMember( $group ) ) |
| 504 | | - : User::getGroupMember( $group ); |
| | 502 | + |
| | 503 | + if ( $checkbox['irreversible'] ) { |
| | 504 | + $text = htmlspecialchars( wfMsg( 'userrights-irreversible-marker', |
| | 505 | + User::getGroupMember( $group ) ) ); |
| | 506 | + } else { |
| | 507 | + $text = htmlspecialchars( User::getGroupMember( $group ) ); |
| | 508 | + } |
| 505 | 509 | $checkboxHtml = Xml::checkLabel( $text, "wpGroup-" . $group, |
| 506 | 510 | "wpGroup-" . $group, $checkbox['set'], $attr ); |
| 507 | 511 | $ret .= "\t\t" . ( $checkbox['disabled'] |
| Index: trunk/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -144,7 +144,7 @@ |
| 145 | 145 | $sk = $wgUser->getSkin(); |
| 146 | 146 | |
| 147 | 147 | if( 0 == $id ) { |
| 148 | | - $user = $nt->getText(); |
| | 148 | + $user = htmlspecialchars( $nt->getText() ); |
| 149 | 149 | } else { |
| 150 | 150 | $user = $sk->link( $nt, htmlspecialchars( $nt->getText() ) ); |
| 151 | 151 | } |
| Index: trunk/phase3/includes/specials/SpecialDeletedContributions.php |
| — | — | @@ -324,7 +324,7 @@ |
| 325 | 325 | $sk = $wgUser->getSkin(); |
| 326 | 326 | |
| 327 | 327 | if ( 0 == $id ) { |
| 328 | | - $user = $nt->getText(); |
| | 328 | + $user = htmlspecialchars( $nt->getText() ); |
| 329 | 329 | } else { |
| 330 | 330 | $user = $sk->link( $nt, htmlspecialchars( $nt->getText() ) ); |
| 331 | 331 | } |
| Index: trunk/phase3/includes/LogPage.php |
| — | — | @@ -214,11 +214,12 @@ |
| 215 | 215 | self::formatBlockFlags( $params[2], is_null( $skin ) ) : ''; |
| 216 | 216 | // Page protections |
| 217 | 217 | } else if ( $type == 'protect' && count($params) == 3 ) { |
| 218 | | - $details .= " {$params[1]}"; // restrictions and expiries |
| 219 | 218 | if( $params[2] ) { |
| 220 | 219 | if ( $skin ) { |
| | 220 | + $details .= htmlspecialchars( " {$params[1]}" ); // restrictions and expiries |
| 221 | 221 | $details .= ' ['.wfMsg('protect-summary-cascade').']'; |
| 222 | 222 | } else { |
| | 223 | + $details .= " {$params[1]}"; |
| 223 | 224 | $details .= ' ['.wfMsgForContent('protect-summary-cascade').']'; |
| 224 | 225 | } |
| 225 | 226 | } |
| — | — | @@ -245,7 +246,7 @@ |
| 246 | 247 | $details .= ': '.RevisionDeleter::getLogMessage( $count, $nfield, $ofield, true ); |
| 247 | 248 | } |
| 248 | 249 | if ( $skin ) { |
| 249 | | - $rv = wfMsgHtml( $wgLogActions[$key], $params ) . $details; |
| | 250 | + $rv = htmlspecialchars( wfMsg( $wgLogActions[$key], $params ) ) . $details; |
| 250 | 251 | } else { |
| 251 | 252 | $rv = wfMsgExt( $wgLogActions[$key], array( 'parsemag', 'escape', 'replaceafter', 'content' ), $params ) . $details; |
| 252 | 253 | } |