From 9923b54af263419f2a7144558d48cffae1a15e35 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Tue, 21 Dec 2010 17:48:42 +0000 Subject: [PATCH] Merge r78700 to trunk --- includes/specials/SpecialAllmessages.php | 1 - includes/specials/SpecialBlockip.php | 2 +- includes/specials/SpecialRevisionMove.php | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php index 15db4b321c..b562ebc6ee 100644 --- a/includes/specials/SpecialAllmessages.php +++ b/includes/specials/SpecialAllmessages.php @@ -330,7 +330,6 @@ class AllmessagesTablePager extends TablePager { return $title . ' (' . $talk . ')'; case 'am_default' : - return Sanitizer::escapeHtmlAllowEntities( $value, ENT_QUOTES ); case 'am_actual' : return Sanitizer::escapeHtmlAllowEntities( $value, ENT_QUOTES ); } diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php index 06bec8b362..ad44b344fc 100644 --- a/includes/specials/SpecialBlockip.php +++ b/includes/specials/SpecialBlockip.php @@ -164,7 +164,7 @@ class IPBlockForm extends SpecialPage { # Show other blocks from extensions, i.e. GlockBlocking and TorBlock if( count( $otherBlockedMsgs ) ) { $wgOut->addHTML( - Html::rawElement( 'h2', array(), wfMsgExt( 'ipb-otherblocks-header', 'parseinline', count( $otherBlockedMsgs ) ) ) . "\n" + Html::rawElement( 'h2', array(), wfMsgExt( 'ipb-otherblocks-header', 'parseinline', count( $otherBlockedMsgs ) ) ) . "\n" ); $list = ''; foreach( $otherBlockedMsgs as $link ) { diff --git a/includes/specials/SpecialRevisionMove.php b/includes/specials/SpecialRevisionMove.php index 813e273f7c..7e5e82895f 100644 --- a/includes/specials/SpecialRevisionMove.php +++ b/includes/specials/SpecialRevisionMove.php @@ -340,7 +340,7 @@ class SpecialRevisionMove extends UnlistedSpecialPage { protected function queryLatestTimestamp( &$dbw, $articleId, $conds = array() ) { $timestampNewRow = $dbw->selectRow( 'revision', - 'max(rev_timestamp) as maxtime', + 'max(rev_timestamp) AS maxtime', array_merge( array( 'rev_page' => $articleId ), $conds ), __METHOD__ ); -- 2.20.1