Unstub $wgLang if still stubbed before storing it; avoid storing a StubUserLang insta...

diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index b4660a4..7cf3f74 100644 (file)
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -195,6 +195,9 @@ class ParserOptions {
                }
                if ( $lang === null ) {
                        global $wgLang;
+                       if ( !StubObject::isRealObject( $wgLang ) ) {
+                               $wgLang->_unstub();
+                       }
                        $lang = $wgLang;
                }
                $this->initialiseFromUser( $user, $lang );