Merge "Follow-up 42333412833a - Fix behaviour $wgVerifyMimeType = false;"

diff --combined includes/upload/UploadBase.php
index 36e4252,710a501..b6ea4c8
--- 1/includes/upload/UploadBase.php
--- 2/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@@ -410,10 -410,10 +410,10 @@@ abstract class UploadBase 
                        return $status;
                }
  
-               if ( $wgVerifyMimeType ) {
-                       $this->mFileProps = FSFile::getPropsFromPath( $this->mTempPath, $this->mFinalExtension );
-                       $mime = $this->mFileProps['file-mime'];
+               $this->mFileProps = FSFile::getPropsFromPath( $this->mTempPath, $this->mFinalExtension );
+               $mime = $this->mFileProps['file-mime'];
  
+               if ( $wgVerifyMimeType ) {
                        # XXX: Missing extension will be caught by validateName() via getTitle()
                        if ( $this->mFinalExtension != '' && !$this->verifyExtension( $mime, $this->mFinalExtension ) ) {
                                wfProfileOut( __METHOD__ );
@@@ -688,7 -688,7 +688,7 @@@
  
                if ( $status->isGood() ) {
                        if ( $watch ) {
 -                              $user->addWatch( $this->getLocalFile()->getTitle() );
 +                              WatchAction::doWatch( $this->getLocalFile()->getTitle(), $user, WatchedItem::IGNORE_USER_RIGHTS );
                        }
                        wfRunHooks( 'UploadComplete', array( &$this ) );
                }