From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 12 Dec 2010 18:35:19 +0000 (+0000)
Subject: Followup r75763, fixup wrong change of deprecated method
X-Git-Tag: 1.31.0-rc.0~33354
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=0de35fc275862c056348fbde524afac8521260e4;p=lhc%2Fweb%2Fwiklou.git

Followup r75763, fixup wrong change of deprecated method

No need to do separate htmlspecialchars et al, Xml::expandAttributes
---

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 6d2b01e1af..f1b599899f 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -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;
diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index b295c572fb..ff2d247478 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -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>)";
 			}