Merge "Language: s/error_log/wfWarn/"

[lhc/web/wiklou.git] / includes / context / RequestContext.php

diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php
index 5178189..ede10fe 100644 (file)
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -297,7 +297,7 @@ class RequestContext implements IContextSource {
                        $e = new Exception;
                        wfDebugLog( 'recursion-guard', "Recursion detected:\n" . $e->getTraceAsString() );
 
-                       $code = $this->getConfig()->get( 'LanguageCode' ) ? : 'en';
+                       $code = $this->getConfig()->get( 'LanguageCode' ) ?: 'en';
                        $this->lang = Language::factory( $code );
                } elseif ( $this->lang === null ) {
                        $this->recursion = true;
@@ -425,6 +425,7 @@ class RequestContext implements IContextSource {
         * Get the RequestContext object associated with the main request
         * and gives a warning to the log, to find places, where a context maybe is missing.
         *
+        * @param string $func
         * @return RequestContext
         * @since 1.24
         */