jenkins-bot has submitted this change and it was merged.

Change subject: Revert more visibility changes in HistoryBlob.php
......................................................................


Revert more visibility changes in HistoryBlob.php

This follows-up bebcf2c58381, which only fixed DiffHistoryBlob.

MediaWiki will fail to load some revisions if the following properties
do not unserialize correctly:

* HistoryBlobStub::$mOldId
* HistoryBlobStub::$mHash
* HistoryBlobCurStub::$mCurId

Visibility of HistoryBlobStub::$mRef is also restored; though the
property's value does not appear to be used after unserialization,
the property is nevertheless a serialized property.

Bug: 65665
Change-Id: I2724d15f9206d66d615d020117e60bb772048c19
---
M includes/HistoryBlob.php
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Anomie: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/HistoryBlob.php b/includes/HistoryBlob.php
index 06e5ecc..d0cae36 100644
--- a/includes/HistoryBlob.php
+++ b/includes/HistoryBlob.php
@@ -197,13 +197,13 @@
        protected static $blobCache = array();
 
        /** @var int */
-       protected $mOldId;
+       public $mOldId;
 
        /** @var string */
-       protected $mHash;
+       public $mHash;
 
        /** @var  */
-       protected $mRef;
+       public $mRef;
 
        /**
         * @param string $hash The content hash of the text
@@ -313,7 +313,7 @@
  */
 class HistoryBlobCurStub {
        /** @var int */
-       private $mCurId;
+       public $mCurId;
 
        /**
         * @param int $curid The cur_id pointed to

-- 
To view, visit https://gerrit.wikimedia.org/r/135382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2724d15f9206d66d615d020117e60bb772048c19
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to