Merge branch '5.1' into 5

This commit is contained in:
github-actions 2023-11-18 14:24:16 +00:00
commit cfd8f05a04

View File

@ -159,13 +159,13 @@ class Deprecation
public static function isEnabled(): bool public static function isEnabled(): bool
{ {
if (!Director::isDev()) {
return false;
}
if (Environment::hasEnv('SS_DEPRECATION_ENABLED')) { if (Environment::hasEnv('SS_DEPRECATION_ENABLED')) {
$envVar = Environment::getEnv('SS_DEPRECATION_ENABLED'); $envVar = Environment::getEnv('SS_DEPRECATION_ENABLED');
return self::varAsBoolean($envVar); return self::varAsBoolean($envVar);
} }
if (!Director::isDev()) {
return false;
}
return static::$currentlyEnabled; return static::$currentlyEnabled;
} }