Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Followup r75763, fixup wrong change of deprecated method

Browse source 
No need to do separate htmlspecialchars et al, Xml::expandAttributes
This commit is contained in:
Sam Reed 2010-12-12 18:35:19 +00:00
parent 22d873f85d
commit 0de35fc275
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/EditPage.php
View file

@ -1223,7 +1223,7 @@ class EditPage {
if ( $this->showHeader() === false )
return;
$action = htmlspecialchars($this->getActionURL($wgTitle));
$action = htmlspecialchars( $this->getActionURL( $wgTitle ) );
if ( $wgUser->getOption( 'showtoolbar' ) and !$this->isCssJsSubpage ) {
# prepare toolbar for edit buttons
@ -2355,7 +2355,9 @@ HTML
);
$checkboxes['minor'] =
Xml::check( 'wpMinoredit', $checked['minor'], $attribs ) .
"&#160;<label for='wpMinoredit' id='mw-editpage-minoredit'" . $skin->titleAttrib( 'minoredit', 'withaccess' ) . ">{$minorLabel}</label>";
"&#160;<label for='wpMinoredit' id='mw-editpage-minoredit'" .
Xml::expandAttributes( array( 'title' => $skin->titleAttrib( 'minoredit', 'withaccess' ) ) ) .
">{$minorLabel}</label>";
}
$watchLabel = wfMsgExt( 'watchthis', array( 'parseinline' ) );
@ -2368,7 +2370,9 @@ HTML
);
$checkboxes['watch'] =
Xml::check( 'wpWatchthis', $checked['watch'], $attribs ) .
"&#160;<label for='wpWatchthis' id='mw-editpage-watch'" . $skin->titleAttrib( 'watch', 'withaccess' ) . ">{$watchLabel}</label>";
"&#160;<label for='wpWatchthis' id='mw-editpage-watch'" .
Xml::expandAttributes( array( 'title' => $skin->titleAttrib( 'watch', 'withaccess' ) ) ) .
">{$watchLabel}</label>";
}
wfRunHooks( 'EditPageBeforeEditChecks', array( &$this, &$checkboxes, &$tabindex ) );
return $checkboxes;

2
includes/diff/DifferenceEngine.php
View file

@ -1006,7 +1006,7 @@ CONTROL;
'undo' => $this->mNewid
) );
$htmlLink = htmlspecialchars( wfMsg( 'editundo' ) );
$htmlTitle = $wgUser->getSkin()->titleAttrib( 'undo' );
$htmlTitle = Xml::expandAttributes( array( 'title' => $skin->titleAttrib( 'undo' ) ) );
if ( $editable && !$this->mOldRev->isDeleted( Revision::DELETED_TEXT ) && !$this->mNewRev->isDeleted( Revision::DELETED_TEXT ) ) {
$this->mNewtitle .= " (<a href='$newUndo' $htmlTitle>" . $htmlLink . "</a>)";
}