Merge "(bug 47070) check content model namespace on import."

[lhc/web/wiklou.git] / includes / filerepo / file / LocalFile.php

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index dd8e38a..687c549 100644 (file)
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1220,8 +1220,8 @@ class LocalFile extends File {
         * @param null|User $user
         * @return bool
         */
-       function recordUpload2(
-               $oldver, $comment, $pageText, $props = false, $timestamp = false, $user = null
+       function recordUpload2( $oldver, $comment, $pageText, $props = false, $timestamp = false,
+               $user = null
        ) {
                wfProfileIn( __METHOD__ );
 
@@ -1458,17 +1458,6 @@ class LocalFile extends File {
                        LinksUpdate::queueRecursiveJobsForTable( $this->getTitle(), 'imagelinks' );
                }
 
-               # Invalidate cache for all pages that redirects on this page
-               $redirs = $this->getTitle()->getRedirectsHere();
-
-               foreach ( $redirs as $redir ) {
-                       if ( !$reupload && $redir->getNamespace() === NS_FILE ) {
-                               LinksUpdate::queueRecursiveJobsForTable( $redir, 'imagelinks' );
-                       }
-                       $update = new HTMLCacheUpdate( $redir, 'imagelinks' );
-                       $update->doUpdate();
-               }
-
                wfProfileOut( __METHOD__ );
 
                return true;