Merge "(bug 43315) Cursor of enhancedchangelist wrong for non-toggle lines"

diff --combined includes/ChangesList.php
index 92cdeea,3e3f542..a2fff57
--- 1/includes/ChangesList.php
--- 2/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@@ -286,10 -286,6 +286,10 @@@ class ChangesList extends ContextSourc
                }
        }
  
 +      /**
 +       * @param $s string HTML to update
 +       * @param $rc_timestamp mixed
 +       */
        public function insertDateHeader( &$s, $rc_timestamp ) {
                # Make date header if necessary
                $date = $this->getLanguage()->userDate( $rc_timestamp, $this->getUser() );
@@@ -303,11 -299,6 +303,11 @@@
                }
        }
  
 +      /**
 +       * @param $s string HTML to update
 +       * @param $title Title
 +       * @param $logtype string
 +       */
        public function insertLog( &$s, $title, $logtype ) {
                $page = new LogPage( $logtype );
                $logname = $page->getName()->escaped();
@@@ -315,7 -306,7 +315,7 @@@
        }
  
        /**
 -       * @param $s
 +       * @param $s string HTML to update
         * @param $rc RecentChange
         * @param $unpatrolled
         */
@@@ -358,7 -349,7 +358,7 @@@
        }
  
        /**
 -       * @param $s
 +       * @param $s string HTML to update
         * @param $rc RecentChange
         * @param $unpatrolled
         * @param $watched
@@@ -393,11 -384,7 +393,11 @@@
        }
  
        /**
 +       * Get the timestamp from $rc formatted with current user's settings
 +       * and a separator
 +       *
         * @param $rc RecentChange
 +       * @return string HTML fragment
         */
        public function getTimestamp( $rc ) {
                return $this->message['semicolon-separator'] . '<span class="mw-changeslist-date">' .
@@@ -405,9 -392,7 +405,9 @@@
        }
  
        /**
 -       * @param $s
 +       * Insert time timestamp string from $rc into $s
 +       *
 +       * @param $s string HTML to update
         * @param $rc RecentChange
         */
        public function insertTimestamp( &$s, $rc ) {
@@@ -590,8 -575,7 +590,8 @@@ class OldChangesList extends ChangesLis
         * @param $rc RecentChange, passed by reference
         * @param $watched Bool (default false)
         * @param $linenumber Int (default null)
 -       * @return string
 +       *
 +       * @return string|bool
         */
        public function recentChangesLine( &$rc, $watched = false, $linenumber = null ) {
                global $wgRCShowChangedSize;
@@@ -682,10 -666,7 +682,10 @@@
                        $classes[] = Sanitizer::escapeClass( 'watchlist-'.$rc->mAttribs['rc_namespace'].'-'.$rc->mAttribs['rc_title'] );
                }
  
 -              wfRunHooks( 'OldChangesListRecentChangesLine', array(&$this, &$s, $rc) );
 +              if ( !wfRunHooks( 'OldChangesListRecentChangesLine', array( &$this, &$s, $rc ) ) ) {
 +                      wfProfileOut( __METHOD__ );
 +                      return false;
 +              }
  
                wfProfileOut( __METHOD__ );
                return "$dateheader<li class=\"".implode( ' ', $classes )."\">".$s."</li>\n";
@@@ -952,7 -933,7 +952,7 @@@ class EnhancedChangesList extends Chang
                                implode( $this->message['semicolon-separator'], $users )
                        )->escaped() . '</span>';
  
-               $tl = '<span class="mw-collapsible-toggle mw-enhancedchanges-arrow"></span>';
+               $tl = '<span class="mw-collapsible-toggle mw-enhancedchanges-arrow mw-enhancedchanges-arrow-space"></span>';
                $r .= "<td>$tl</td>";
  
                # Main line
@@@ -1206,7 -1187,7 +1206,7 @@@
                $r = Html::openElement( 'table', array( 'class' => $classes ) ) .
                        Html::openElement( 'tr' );
  
-               $r .= '<td class="mw-enhanced-rc"><span class="mw-enhancedchanges-arrow mw-enhancedchanges-arrow-space"></span>';
+               $r .= '<td class="mw-enhanced-rc"><span class="mw-enhancedchanges-arrow-space"></span>';
                # Flag and Timestamp
                if( $type == RC_MOVE || $type == RC_MOVE_OVER_REDIRECT ) {
                        $r .= '&#160;&#160;&#160;&#160;'; // 4 flags -> 4 spaces