Merge "Allow to pass a rev id to a log entry without making it unpatrolled"

diff --combined includes/changes/RecentChange.php
index 9f68338,f3bbb9e..2508304
--- 1/includes/changes/RecentChange.php
--- 2/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@@ -461,7 -461,6 +461,7 @@@ class RecentChange 
         */
        public function doMarkPatrolled( User $user, $auto = false, $tags = null ) {
                global $wgUseRCPatrol, $wgUseNPPatrol, $wgUseFilePatrol;
 +
                $errors = [];
                // If recentchanges patrol is disabled, only new pages or new file versions
                // can be patrolled, provided the appropriate config variable is set
@@@ -498,8 -497,8 +498,8 @@@
                PatrolLog::record( $this, $auto, $user, $tags );
  
                Hooks::run(
 -                                      'MarkPatrolledComplete',
 -                                      [ $this->getAttribute( 'rc_id' ), &$user, false, $auto ]
 +                      'MarkPatrolledComplete',
 +                      [ $this->getAttribute( 'rc_id' ), &$user, false, $auto ]
                );
  
                return [];
@@@ -720,11 -719,12 +720,12 @@@
         * @param int $newId
         * @param string $actionCommentIRC
         * @param int $revId Id of associated revision, if any
+        * @param bool $isPatrollable Whether this log entry is patrollable
         * @return RecentChange
         */
        public static function newLogEntry( $timestamp, &$title, &$user, $actionComment, $ip,
                $type, $action, $target, $logComment, $params, $newId = 0, $actionCommentIRC = '',
-               $revId = 0 ) {
+               $revId = 0, $isPatrollable = false ) {
                global $wgRequest;
  
                # # Get pageStatus for email notification
@@@ -748,9 -748,8 +749,8 @@@
                                break;
                }
  
-               // Allow unpatrolled status when an associated rev id is passed
-               // May be used in core by moves and uploads
-               $markPatrolled = ( $revId > 0 ) ? $user->isAllowed( 'autopatrol' ) : true;
+               // Allow unpatrolled status for patrollable log entries
+               $markPatrolled = $isPatrollable ? $user->isAllowed( 'autopatrol' ) : true;
  
                $rc = new RecentChange;
                $rc->mTitle = $target;

diff --combined includes/filerepo/file/LocalFile.php
index 3f7eadb,a324283..9677f5d
--- 1/includes/filerepo/file/LocalFile.php
--- 2/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@@ -242,7 -242,7 +242,7 @@@ class LocalFile extends File 
         * Try to load file metadata from memcached. Returns true on success.
         * @return bool
         */
 -      function loadFromCache() {
 +      private function loadFromCache() {
                $this->dataLoaded = false;
                $this->extraDataLoaded = false;
                $key = $this->getCacheKey();
@@@ -279,7 -279,7 +279,7 @@@
        /**
         * Save the file metadata to memcached
         */
 -      function saveToCache() {
 +      private function saveToCache() {
                $this->load();
  
                $key = $this->getCacheKey();
@@@ -915,7 -915,6 +915,7 @@@
                // Purge any custom thumbnail caches
                Hooks::run( 'LocalFilePurgeThumbnails', [ $this, $archiveName ] );
  
 +              // Delete thumbnails
                $dir = array_shift( $files );
                $this->purgeThumbList( $dir, $files );
  
@@@ -932,6 -931,7 +932,6 @@@
         * @param array $options
         */
        public function purgeThumbnails( $options = [] ) {
 -              // Delete thumbnails
                $files = $this->getThumbnails();
                // Always purge all files from CDN regardless of handler filters
                $urls = [];
@@@ -951,7 -951,6 +951,7 @@@
                // Purge any custom thumbnail caches
                Hooks::run( 'LocalFilePurgeThumbnails', [ $this, false ] );
  
 +              // Delete thumbnails
                $dir = array_shift( $files );
                $this->purgeThumbList( $dir, $files );
  
@@@ -1486,6 -1485,9 +1486,9 @@@
                                $logEntry->setTags( $tags );
                        }
  
+                       # Uploads can be patrolled
+                       $logEntry->setIsPatrollable( true );
+ 
                        # Now that the log entry is up-to-date, make an RC entry.
                        $logEntry->publish( $logId );
  
@@@ -2771,7 -2773,7 +2774,7 @@@ class LocalFileMoveBatch 
                $this->newName = $this->file->repo->getNameFromTitle( $this->target );
                $this->oldRel = $this->oldHash . $this->oldName;
                $this->newRel = $this->newHash . $this->newName;
 -              $this->db = $file->getRepo()->getMasterDb();
 +              $this->db = $file->getRepo()->getMasterDB();
        }
  
        /**