Merge branch '5.1' into 5

silverstripe · Nov 18, 2023 · cfd8f05 · cfd8f05
2 parents f22282a + 1ae7e92
commit cfd8f05
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Dev/Deprecation.php b/src/Dev/Deprecation.php
@@ -159,13 +159,13 @@ protected static function get_called_method_from_trace($backtrace, $level = 1)
 
     public static function isEnabled(): bool
     {
-        if (!Director::isDev()) {
-            return false;
-        }
         if (Environment::hasEnv('SS_DEPRECATION_ENABLED')) {
             $envVar = Environment::getEnv('SS_DEPRECATION_ENABLED');
             return self::varAsBoolean($envVar);
         }
+        if (!Director::isDev()) {
+            return false;
+        }
         return static::$currentlyEnabled;
     }