Merge "Only run sha1_file once per file in FSFile"

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 3a37f11..49713fc 100644 (file)
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -239,7 +239,7 @@ abstract class UploadBase {
         * Get the base 36 SHA1 of the file
         * @return string
         */
-       protected function getTempFileSha1Base36() {
+       public function getTempFileSha1Base36() {
                return FSFile::getSha1Base36FromPath( $this->mTempPath );
        }
 

diff --git a/includes/upload/UploadFromStash.php b/includes/upload/UploadFromStash.php
index 71ee96b..fd2416d 100644 (file)
--- a/includes/upload/UploadFromStash.php
+++ b/includes/upload/UploadFromStash.php
@@ -133,7 +133,7 @@ class UploadFromStash extends UploadBase {
         * Get the base 36 SHA1 of the file
         * @return string
         */
-       protected function getTempFileSha1Base36() {
+       public function getTempFileSha1Base36() {
                return $this->mFileProps['sha1'];
        }