Merge "Add anchor "mw-oldid" for beginning of page content in diff view"

diff --combined includes/diff/DifferenceEngine.php
index a0e1a96,f9f9d32..77bbd36
--- 1/includes/diff/DifferenceEngine.php
--- 2/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@@ -94,10 -94,6 +94,10 @@@ class DifferenceEngine extends ContextS
  
        /** @var bool Show rev_deleted content if allowed */
        protected $unhide = false;
 +
 +      /** @var bool Refresh the diff cache */
 +      protected $mRefreshCache = false;
 +
        /**#@-*/
  
        /**
@@@ -550,7 -546,7 +550,7 @@@
                $out = $this->getOutput();
                $revHeader = $this->getRevisionHeader( $this->mNewRev );
                # Add "current version as of X" title
-               $out->addHTML( "<hr class='diff-hr' />
+               $out->addHTML( "<hr class='diff-hr' id='mw-oldid' />
                <h2 class='diff-currentversion-title'>{$revHeader}</h2>\n" );
                # Page content may be handled by a hooked call instead...
                # @codingStandardsIgnoreStart Ignoring long lines.
@@@ -609,7 -605,7 +609,7 @@@
        protected function getParserOutput( WikiPage $page, Revision $rev ) {
                $parserOptions = $page->makeParserOptions( $this->getContext() );
  
 -              if ( !$rev->isCurrent() || !$rev->getTitle()->quickUserCan( "edit" ) ) {
 +              if ( !$rev->isCurrent() || !$rev->getTitle()->quickUserCan( 'edit', $this->getUser() ) ) {
                        $parserOptions->setEditSection( false );
                }
  
@@@ -966,7 -962,7 +966,7 @@@
                        $users = $this->mNewPage->getAuthorsBetween( $oldRev, $newRev, $limit );
                        $numUsers = count( $users );
  
 -                      if ( $numUsers == 1 && $users[0] == $newRev->getRawUserText() ) {
 +                      if ( $numUsers == 1 && $users[0] == $newRev->getUserText( Revision::RAW ) ) {
                                $numUsers = 0; // special case to say "by the same user" instead of "by one other user"
                        }