Merge r78700 to trunk

diff --git a/includes/specials/SpecialAllmessages.php b/includes/specials/SpecialAllmessages.php
index 15db4b3..b562ebc 100644 (file)
--- 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 06bec8b..ad44b34 100644 (file)
--- 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 813e273..7e5e828 100644 (file)
--- 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__
                );