jenkins-bot has submitted this change and it was merged.
Change subject: When serializing Message, don't try to unstub StubUserLang
......................................................................
When serializing Message, don't try to unstub StubUserLang
If the serialization is happening during PHP shutdown due to a Session
save, it can fatal because $wgLang is already gone.
Change-Id: I7d877be15ef8639f3b94b74bba763053ec289358
---
M includes/Message.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Message.php b/includes/Message.php
index 54efd26..c71a953 100644
--- a/includes/Message.php
+++ b/includes/Message.php
@@ -271,7 +271,7 @@
public function serialize() {
return serialize( array(
'interface' => $this->interface,
- 'language' => $this->language->getCode(),
+ 'language' => $this->language instanceof StubUserLang ?
false : $this->language->getCode(),
'key' => $this->key,
'keysToTry' => $this->keysToTry,
'parameters' => $this->parameters,
@@ -287,6 +287,8 @@
* @param string $serialized
*/
public function unserialize( $serialized ) {
+ global $wgLang;
+
$data = unserialize( $serialized );
$this->interface = $data['interface'];
$this->key = $data['key'];
@@ -294,7 +296,7 @@
$this->parameters = $data['parameters'];
$this->format = $data['format'];
$this->useDatabase = $data['useDatabase'];
- $this->language = Language::factory( $data['language'] );
+ $this->language = $data['language'] ? Language::factory(
$data['language'] ) : $wgLang;
$this->title = $data['title'];
}
--
To view, visit https://gerrit.wikimedia.org/r/267414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d877be15ef8639f3b94b74bba763053ec289358
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
