Merge pull request #272 from creative-commoners/pulls/5/fix-fallback-…

…email FIX Handle when fallback email address is an array
silverstripe · Feb 20, 2025 · ce8adf2 · ce8adf2
2 parents cd7b692 + 27eb959
commit ce8adf2
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/Extensions/ContentReviewDefaultSettings.php b/src/Extensions/ContentReviewDefaultSettings.php
@@ -222,9 +222,14 @@ public function getReviewFrom()
         if ($from) {
             return $from;
         }
-
         // Fall back to admin email
-        return Config::inst()->get(Email::class, 'admin_email');
+        $adminEmail = Config::inst()->get(Email::class, 'admin_email');
+        if (is_array($adminEmail)) {
+            // May be configured using an array ['admin-email@mysite.text' => 'Admin email label']
+            // https://docs.silverstripe.org/en/developer_guides/email/#administrator-emails
+            return array_values(array_keys($adminEmail))[0];
+        }
+        return $adminEmail;
     }
 
     /**