Merge "Prevent deleteBatch.php deleting files from redirects"

diff --git a/includes/HistoryBlob.php b/includes/HistoryBlob.php
index e95536a..06e5ecc 100644 (file)
--- a/includes/HistoryBlob.php
+++ b/includes/HistoryBlob.php
@@ -374,7 +374,7 @@ class DiffHistoryBlob implements HistoryBlob {
        protected $mDefaultKey;
 
        /** @var string Compressed storage */
-       protected $mCompressed;
+       public $mCompressed;
 
        /** @var bool True if the object is locked against further writes */
        protected $mFrozen = false;

diff --git a/includes/filerepo/file/ArchivedFile.php b/includes/filerepo/file/ArchivedFile.php
index 845fd71..1eee6a2 100644 (file)
--- a/includes/filerepo/file/ArchivedFile.php
+++ b/includes/filerepo/file/ArchivedFile.php
@@ -281,6 +281,10 @@ class ArchivedFile {
         * @return string
         */
        public function getName() {
+               if ( $this->name === false ) {
+                       $this->load();
+               }
+
                return $this->name;
        }