*/
private static $instance = null;
+ /**
+ * Boolean flag to guard against recursion in getLanguage
+ * @var bool
+ */
+ private $languageRecursion = false;
+
/**
* @param Config $config
*/
* @since 1.19
*/
public function getLanguage() {
- if ( isset( $this->recursion ) ) {
+ if ( $this->languageRecursion === true ) {
trigger_error( "Recursion detected in " . __METHOD__, E_USER_WARNING );
$e = new Exception;
wfDebugLog( 'recursion-guard', "Recursion detected:\n" . $e->getTraceAsString() );
$code = $this->getConfig()->get( 'LanguageCode' ) ?: 'en';
$this->lang = Language::factory( $code );
} elseif ( $this->lang === null ) {
- $this->recursion = true;
+ $this->languageRecursion = true;
try {
$request = $this->getRequest();
$this->lang = $obj;
}
} finally {
- unset( $this->recursion );
+ $this->languageRecursion = false;
}
}