jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/362942 )
Change subject: Use double quotes instead of singe quotes for HTML attributes ...................................................................... Use double quotes instead of singe quotes for HTML attributes htmlspecialchars[1] encodes only double quotes not single quotes. Therefor the HTML attribute must enclosed with double quotes for correct output encoding. [1] https://secure.php.net/manual/en/function.htmlspecialchars.php Change-Id: I3fec5299585187ed70d62b9248007af34b0db85b --- M includes/diff/DifferenceEngine.php M includes/logging/BlockLogFormatter.php 2 files changed, 14 insertions(+), 14 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index d4bee29..7f9af60 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -1174,17 +1174,17 @@ if ( !$diff && !$otitle ) { $header .= " - <tr style='vertical-align: top;' lang='{$userLang}'> - <td class='diff-ntitle'>{$ntitle}</td> + <tr style=\"vertical-align: top;\" lang=\"{$userLang}\"> + <td class=\"diff-ntitle\">{$ntitle}</td> </tr>"; $multiColspan = 1; } else { if ( $diff ) { // Safari/Chrome show broken output if cols not used $header .= " - <col class='diff-marker' /> - <col class='diff-content' /> - <col class='diff-marker' /> - <col class='diff-content' />"; + <col class=\"diff-marker\" /> + <col class=\"diff-content\" /> + <col class=\"diff-marker\" /> + <col class=\"diff-content\" />"; $colspan = 2; $multiColspan = 4; } else { @@ -1193,20 +1193,20 @@ } if ( $otitle || $ntitle ) { $header .= " - <tr style='vertical-align: top;' lang='{$userLang}'> - <td colspan='$colspan' class='diff-otitle'>{$otitle}</td> - <td colspan='$colspan' class='diff-ntitle'>{$ntitle}</td> + <tr style=\"vertical-align: top;\" lang=\"{$userLang}\"> + <td colspan=\"$colspan\" class=\"diff-otitle\">{$otitle}</td> + <td colspan=\"$colspan\" class=\"diff-ntitle\">{$ntitle}</td> </tr>"; } } if ( $multi != '' ) { - $header .= "<tr><td colspan='{$multiColspan}' style='text-align: center;' " . - "class='diff-multi' lang='{$userLang}'>{$multi}</td></tr>"; + $header .= "<tr><td colspan=\"{$multiColspan}\" style=\"text-align: center;\" " . + "class=\"diff-multi\" lang=\"{$userLang}\">{$multi}</td></tr>"; } if ( $notice != '' ) { - $header .= "<tr><td colspan='{$multiColspan}' style='text-align: center;' " . - "lang='{$userLang}'>{$notice}</td></tr>"; + $header .= "<tr><td colspan=\"{$multiColspan}\" style=\"text-align: center;\" " . + "lang=\"{$userLang}\">{$notice}</td></tr>"; } return $header . $diff . "</table>"; diff --git a/includes/logging/BlockLogFormatter.php b/includes/logging/BlockLogFormatter.php index a0bfb59..1ed18cd 100644 --- a/includes/logging/BlockLogFormatter.php +++ b/includes/logging/BlockLogFormatter.php @@ -60,7 +60,7 @@ // is shown on the correct side of the tooltip text. $durationTooltip = '‎' . htmlspecialchars( $params[4] ); $params[4] = Message::rawParam( - "<span class='blockExpiry' title='$durationTooltip'>" . + "<span class=\"blockExpiry\" title=\"$durationTooltip\">" . $this->context->getLanguage()->translateBlockExpiry( $params[4], $this->context->getUser(), -- To view, visit https://gerrit.wikimedia.org/r/362942 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3fec5299585187ed70d62b9248007af34b0db85b Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Fomafix <foma...@googlemail.com> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
