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

Fixes for r102295:

Browse source 
* Rename getDiffText to getDiffLink since that's what it actually gets. Fix associated variable names. 
* Use Html::element() not Html::rawElement() when escaping is desired.
This commit is contained in:
Tim Starling 2011-12-09 05:54:26 +00:00
parent 6d626866de
commit b36df6ecc6
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
includes/FeedUtils.php
View file

@ -131,7 +131,7 @@ class FeedUtils {
if ( $wgFeedDiffCutoff <= 0 || ( strlen( $diffText ) > $wgFeedDiffCutoff ) ) { if ( $wgFeedDiffCutoff <= 0 || ( strlen( $diffText ) > $wgFeedDiffCutoff ) ) {
// Omit large diffs // Omit large diffs
$diffText = self::getDiffText( $title, $newid, $oldid); $diffText = self::getDiffLink( $title, $newid, $oldid );
} elseif ( $diffText === false ) { } elseif ( $diffText === false ) {
// Error in diff engine, probably a missing revision // Error in diff engine, probably a missing revision
$diffText = "<p>Can't load revision $newid</p>"; $diffText = "<p>Can't load revision $newid</p>";
@ -150,7 +150,7 @@ class FeedUtils {
} }
if ( $wgFeedDiffCutoff <= 0 || strlen( $newtext ) > $wgFeedDiffCutoff ) { if ( $wgFeedDiffCutoff <= 0 || strlen( $newtext ) > $wgFeedDiffCutoff ) {
// Omit large new page diffs, bug 29110 // Omit large new page diffs, bug 29110
$diffText = self::getDiffText( $title, $newid ); $diffText = self::getDiffLink( $title, $newid );
} else { } else {
$diffText = '<p><b>' . wfMsg( 'newpage' ) . '</b></p>' . $diffText = '<p><b>' . wfMsg( 'newpage' ) . '</b></p>' .
'<div>' . nl2br( htmlspecialchars( $newtext ) ) . '</div>'; '<div>' . nl2br( htmlspecialchars( $newtext ) ) . '</div>';
@ -170,17 +170,16 @@ class FeedUtils {
* @param $newid Integer newid for this diff * @param $newid Integer newid for this diff
* @param $oldid Integer|null oldid for the diff. Null means it is a new article * @param $oldid Integer|null oldid for the diff. Null means it is a new article
*/ */
protected static function getDiffText( Title $title, $newid, $oldid = null ) { protected static function getDiffLink( Title $title, $newid, $oldid = null ) {
$queryParameters = ($oldid == null) $queryParameters = ($oldid == null)
? "diff={$newid}" ? "diff={$newid}"
: "diff={$newid}&oldid={$oldid}" ; : "diff={$newid}&oldid={$oldid}" ;
$diffLink = $title->escapeFullUrl( $queryParameters ); $diffUrl = $title->escapeFullUrl( $queryParameters );
$diffText = Html::RawElement( 'a', array( 'href' => $diffLink ), $diffLink = Html::element( 'a', array( 'href' => $diffUrl ),
htmlspecialchars( wfMsgForContent( 'showdiff' ) ) wfMsgForContent( 'showdiff' ) );
);
return $diffText; return $diffLink;
} }
/** /**