Partial revert to r87584

To fix bug bug 30355 importImages.php Internal Error

diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index d879f07..03a951a 100644 (file)
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -860,6 +860,25 @@ class LocalFile extends File {
                return $status;
        }
 
+       /**
+        * Record a file upload in the upload log and the image table
+        */
+       function recordUpload( $oldver, $desc, $license = '', $copyStatus = '', $source = '',
+               $watch = false, $timestamp = false )
+       {
+               $pageText = SpecialUpload::getInitialPageText( $desc, $license, $copyStatus, $source );
+
+               if ( !$this->recordUpload2( $oldver, $desc, $pageText ) ) {
+                       return false;
+               }
+
+               if ( $watch ) {
+                       global $wgUser;
+                       $wgUser->addWatch( $this->getTitle() );
+               }
+               return true;
+       }
+
        /**
         * Record a file upload in the upload log and the image table
         */