Merge "registration: Only allow one extension to set a specific config setting"

[lhc/web/wiklou.git] / includes / Status.php

diff --git a/includes/Status.php b/includes/Status.php
index 5456ed0..a35af6e 100644 (file)
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -153,9 +153,12 @@ class Status extends StatusValue {
         * @return Language
         */
        protected function languageFromParam( $lang ) {
+               global $wgLang;
+
                if ( $lang === null ) {
-                       return RequestContext::getMain()->getLanguage();
-               } elseif ( $lang instanceof Language ) {
+                       // @todo: Use RequestContext::getMain()->getLanguage() instead
+                       return $wgLang;
+               } elseif ( $lang instanceof Language || $lang instanceof StubUserLang ) {
                        return $lang;
                } else {
                        return Language::factory( $lang );