Merge "EnhancedChangesList: Add missing </td></tr>"

diff --combined includes/changes/EnhancedChangesList.php
index 4837525,88fb209..c8439be
--- 1/includes/changes/EnhancedChangesList.php
--- 2/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@@ -98,8 -98,7 +98,8 @@@ class EnhancedChangesList extends Chang
                                $logtitle = SpecialPage::getTitleFor( 'Log', $logType );
                                $logpage = new LogPage( $logType );
                                $logname = $logpage->getName()->escaped();
 -                              $clink = $this->msg( 'parentheses' )->rawParams( Linker::linkKnown( $logtitle, $logname ) )->escaped();
 +                              $clink = $this->msg( 'parentheses' )
 +                                      ->rawParams( Linker::linkKnown( $logtitle, $logname ) )->escaped();
                        } else {
                                $clink = Linker::link( $cacheEntry->getTitle() );
                        }
@@@ -163,8 -162,7 +163,8 @@@
  
                # Make user links
                if ( $this->isDeleted( $cacheEntry, Revision::DELETED_USER ) ) {
 -                      $cacheEntry->userlink = ' <span class="history-deleted">' . $this->msg( 'rev-deleted-user' )->escaped() . '</span>';
 +                      $cacheEntry->userlink = ' <span class="history-deleted">' .
 +                              $this->msg( 'rev-deleted-user' )->escaped() . '</span>';
                } else {
                        $cacheEntry->userlink = Linker::userLink(
                                $cacheEntry->mAttribs['rc_user'],
@@@ -220,10 -218,10 +220,10 @@@
                if ( $block[0]->mAttribs['rc_log_type'] ) {
                        # Log entry
                        $classes[] = Sanitizer::escapeClass( 'mw-changeslist-log-'
 -                                      . $block[0]->mAttribs['rc_log_type'] . '-' . $block[0]->mAttribs['rc_title'] );
 +                              . $block[0]->mAttribs['rc_log_type'] . '-' . $block[0]->mAttribs['rc_title'] );
                } else {
                        $classes[] = Sanitizer::escapeClass( 'mw-changeslist-ns'
 -                                      . $block[0]->mAttribs['rc_namespace'] . '-' . $block[0]->mAttribs['rc_title'] );
 +                              . $block[0]->mAttribs['rc_namespace'] . '-' . $block[0]->mAttribs['rc_title'] );
                }
                $classes[] = $block[0]->watched && $block[0]->mAttribs['rc_timestamp'] >= $block[0]->watched
                        ? 'mw-changeslist-line-watched' : 'mw-changeslist-line-not-watched';
@@@ -288,9 -286,7 +288,9 @@@
                        $text = $userlink;
                        $text .= $this->getLanguage()->getDirMark();
                        if ( $count > 1 ) {
 -                              $text .= ' ' . $this->msg( 'parentheses' )->rawParams( $this->getLanguage()->formatNum( $count ) . '×' )->escaped();
 +                              // @todo FIXME: Hardcoded '×'. Should be a message.
 +                              $formattedCount = $this->getLanguage()->formatNum( $count ) . '×';
 +                              $text .= ' ' . $this->msg( 'parentheses' )->rawParams( $formattedCount )->escaped();
                        }
                        array_push( $users, $text );
                }
@@@ -300,8 -296,7 +300,8 @@@
                                implode( $this->message['semicolon-separator'], $users )
                        )->escaped() . '</span>';
  
 -              $tl = '<span class="mw-collapsible-toggle mw-collapsible-arrow mw-enhancedchanges-arrow mw-enhancedchanges-arrow-space"></span>';
 +              $tl = '<span class="mw-collapsible-toggle mw-collapsible-arrow ' .
 +                      'mw-enhancedchanges-arrow mw-enhancedchanges-arrow-space"></span>';
                $r .= "<td>$tl</td>";
  
                # Main line
@@@ -317,8 -312,7 +317,8 @@@
  
                # Article link
                if ( $namehidden ) {
 -                      $r .= ' <span class="history-deleted">' . $this->msg( 'rev-deleted-event' )->escaped() . '</span>';
 +                      $r .= ' <span class="history-deleted">' .
 +                              $this->msg( 'rev-deleted-event' )->escaped() . '</span>';
                } elseif ( $allLogs ) {
                        $r .= $this->maybeWatchedLink( $block[0]->link, $block[0]->watched );
                } else {
@@@ -433,6 -427,7 +433,7 @@@
  
                $r .= $users;
                $r .= $this->numberofWatchingusers( $block[0]->numberofWatchingusers );
+               $r .= '</td></tr>';
  
                # Sub-entries
                foreach ( $block as $rcObj ) {
@@@ -467,11 -462,11 +468,11 @@@
                        } else {
  
                                $link = Linker::linkKnown(
 -                                              $rcObj->getTitle(),
 -                                              $rcObj->timestamp,
 -                                              array(),
 -                                              $params
 -                                      );
 +                                      $rcObj->getTitle(),
 +                                      $rcObj->timestamp,
 +                                      array(),
 +                                      $params
 +                              );
                                if ( $this->isDeleted( $rcObj, Revision::DELETED_TEXT ) ) {
                                        $link = '<span class="history-deleted">' . $link . '</span> ';
                                }
@@@ -479,11 -474,7 +480,11 @@@
                        $r .= $link . '</span>';
  
                        if ( !$type == RC_LOG || $type == RC_NEW ) {
 -                              $r .= ' ' . $this->msg( 'parentheses' )->rawParams( $rcObj->curlink . $this->message['pipe-separator'] . $rcObj->lastlink )->escaped();
 +                              $r .= ' ' . $this->msg( 'parentheses' )->rawParams(
 +                                      $rcObj->curlink .
 +                                              $this->message['pipe-separator'] .
 +                                              $rcObj->lastlink
 +                              )->escaped();
                        }
                        $r .= ' <span class="mw-changeslist-separator">. .</span> ';
  
@@@ -532,7 -523,6 +533,7 @@@
                $encUrl = htmlspecialchars( $wgStylePath . '/common/images/Arr_' . $dir . '.png' );
                $encAlt = htmlspecialchars( $alt );
                $encTitle = htmlspecialchars( $title );
 +
                return "<img src=\"$encUrl\" width=\"12\" height=\"12\" alt=\"$encAlt\" title=\"$encTitle\" />";
        }
  
@@@ -543,7 -533,6 +544,7 @@@
         */
        protected function sideArrow() {
                $dir = $this->getLanguage()->isRTL() ? 'l' : 'r';
 +
                return $this->arrow( $dir, '+', $this->msg( 'rc-enhanced-expand' )->text() );
        }
  
@@@ -582,10 -571,10 +583,10 @@@
                if ( $logType ) {
                        # Log entry
                        $classes[] = Sanitizer::escapeClass( 'mw-changeslist-log-'
 -                                      . $logType . '-' . $rcObj->mAttribs['rc_title'] );
 +                              . $logType . '-' . $rcObj->mAttribs['rc_title'] );
                } else {
                        $classes[] = Sanitizer::escapeClass( 'mw-changeslist-ns' .
 -                                      $rcObj->mAttribs['rc_namespace'] . '-' . $rcObj->mAttribs['rc_title'] );
 +                              $rcObj->mAttribs['rc_namespace'] . '-' . $rcObj->mAttribs['rc_title'] );
                }
                $classes[] = $rcObj->watched && $rcObj->mAttribs['rc_timestamp'] >= $rcObj->watched
                        ? 'mw-changeslist-line-watched' : 'mw-changeslist-line-not-watched';
@@@ -610,21 -599,19 +611,21 @@@
                        $logPage = new LogPage( $logType );
                        $logTitle = SpecialPage::getTitleFor( 'Log', $logType );
                        $logName = $logPage->getName()->escaped();
 -                      $r .= $this->msg( 'parentheses' )->rawParams( Linker::linkKnown( $logTitle, $logName ) )->escaped();
 +                      $r .= $this->msg( 'parentheses' )
 +                              ->rawParams( Linker::linkKnown( $logTitle, $logName ) )->escaped();
                } else {
                        $this->insertArticleLink( $r, $rcObj, $rcObj->unpatrolled, $rcObj->watched );
                }
                # Diff and hist links
                if ( $type != RC_LOG ) {
                        $query['action'] = 'history';
 -                      $r .= ' ' . $this->msg( 'parentheses' )->rawParams( $rcObj->difflink . $this->message['pipe-separator'] . Linker::linkKnown(
 -                              $rcObj->getTitle(),
 -                              $this->message['hist'],
 -                              array(),
 -                              $query
 -                      ) )->escaped();
 +                      $r .= ' ' . $this->msg( 'parentheses' )
 +                              ->rawParams( $rcObj->difflink . $this->message['pipe-separator'] . Linker::linkKnown(
 +                                      $rcObj->getTitle(),
 +                                      $this->message['hist'],
 +                                      array(),
 +                                      $query
 +                              ) )->escaped();
                }
                $r .= ' <span class="mw-changeslist-separator">. .</span> ';
                # Character diff
@@@ -662,7 -649,7 +663,7 @@@
         * @return string
         */
        protected function recentChangesBlock() {
 -              if ( count ( $this->rc_cache ) == 0 ) {
 +              if ( count( $this->rc_cache ) == 0 ) {
                        return '';
                }
  
@@@ -690,4 -677,5 +691,4 @@@
        public function endRecentChangesList() {
                return $this->recentChangesBlock() . parent::endRecentChangesList();
        }
 -
  }