Fixed bug in LocalFile::isCacheable().

* The metadata field is actually defaulting to "" not null.

Change-Id: I745441c7061494db26de7f64dda30b80171c9443

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index b07186d..3cb1f41 100644 (file)
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1686,8 +1686,9 @@ class LocalFile extends File {
         * @return bool Whether to cache in RepoGroup (this avoids OOMs)
         */
        function isCacheable() {
-               $this->load(); // if loaded from cache, metadata will be null if it didn't fit
-               return $this->metadata !== null
+               $this->load();
+               // If extra data (metadata) was not loaded then it must have been large
+               return $this->extraDataLoaded
                        && strlen( serialize( $this->metadata ) ) <= self::CACHE_FIELD_MAX_LEN;
        }