| Index: trunk/phase3/includes/diff/DifferenceEngine.php |
| — | — | @@ -1006,7 +1006,7 @@ |
| 1007 | 1007 | 'undo' => $this->mNewid |
| 1008 | 1008 | ) ); |
| 1009 | 1009 | $htmlLink = htmlspecialchars( wfMsg( 'editundo' ) ); |
| 1010 | | - $htmlTitle = $wgUser->getSkin()->titleAttrib( 'undo' ); |
| | 1010 | + $htmlTitle = Xml::expandAttributes( array( 'title' => $skin->titleAttrib( 'undo' ) ) ); |
| 1011 | 1011 | if ( $editable && !$this->mOldRev->isDeleted( Revision::DELETED_TEXT ) && !$this->mNewRev->isDeleted( Revision::DELETED_TEXT ) ) { |
| 1012 | 1012 | $this->mNewtitle .= " (<a href='$newUndo' $htmlTitle>" . $htmlLink . "</a>)"; |
| 1013 | 1013 | } |
| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1223,7 +1223,7 @@ |
| 1224 | 1224 | if ( $this->showHeader() === false ) |
| 1225 | 1225 | return; |
| 1226 | 1226 | |
| 1227 | | - $action = htmlspecialchars($this->getActionURL($wgTitle)); |
| | 1227 | + $action = htmlspecialchars( $this->getActionURL( $wgTitle ) ); |
| 1228 | 1228 | |
| 1229 | 1229 | if ( $wgUser->getOption( 'showtoolbar' ) and !$this->isCssJsSubpage ) { |
| 1230 | 1230 | # prepare toolbar for edit buttons |
| — | — | @@ -2355,7 +2355,9 @@ |
| 2356 | 2356 | ); |
| 2357 | 2357 | $checkboxes['minor'] = |
| 2358 | 2358 | Xml::check( 'wpMinoredit', $checked['minor'], $attribs ) . |
| 2359 | | - " <label for='wpMinoredit' id='mw-editpage-minoredit'" . $skin->titleAttrib( 'minoredit', 'withaccess' ) . ">{$minorLabel}</label>"; |
| | 2359 | + " <label for='wpMinoredit' id='mw-editpage-minoredit'" . |
| | 2360 | + Xml::expandAttributes( array( 'title' => $skin->titleAttrib( 'minoredit', 'withaccess' ) ) ) . |
| | 2361 | + ">{$minorLabel}</label>"; |
| 2360 | 2362 | } |
| 2361 | 2363 | |
| 2362 | 2364 | $watchLabel = wfMsgExt( 'watchthis', array( 'parseinline' ) ); |
| — | — | @@ -2368,7 +2370,9 @@ |
| 2369 | 2371 | ); |
| 2370 | 2372 | $checkboxes['watch'] = |
| 2371 | 2373 | Xml::check( 'wpWatchthis', $checked['watch'], $attribs ) . |
| 2372 | | - " <label for='wpWatchthis' id='mw-editpage-watch'" . $skin->titleAttrib( 'watch', 'withaccess' ) . ">{$watchLabel}</label>"; |
| | 2374 | + " <label for='wpWatchthis' id='mw-editpage-watch'" . |
| | 2375 | + Xml::expandAttributes( array( 'title' => $skin->titleAttrib( 'watch', 'withaccess' ) ) ) . |
| | 2376 | + ">{$watchLabel}</label>"; |
| 2373 | 2377 | } |
| 2374 | 2378 | wfRunHooks( 'EditPageBeforeEditChecks', array( &$this, &$checkboxes, &$tabindex ) ); |
| 2375 | 2379 | return $checkboxes; |