diff -u b/src/Fast404.php b/src/Fast404.php
--- b/src/Fast404.php
+++ b/src/Fast404.php
@@ -213,8 +213,9 @@
// If a file is set to provide us with Fast 404 joy, load it.
if (($this->loadHtml || Settings::get('fast404_HTML_error_all_paths', FALSE) === TRUE)) {
if (is_array($custom_404)) {
- // If it is an array, get path depending on the langcode;
- // if langcode is NULL, default to the first value.
+ // For arrays, use the path associated with the langcode or the
+ //first path if the langcode is not set.
+
$custom_404_path = $this->langcode && isset($custom_404[$this->langcode]) ? $custom_404[$this->langcode] : reset($custom_404);
}
else {
diff -u b/tests/html/en.html b/tests/html/en.html
--- b/tests/html/en.html
+++ b/tests/html/en.html
@@ -2,13 +2,11 @@
-
-
-
-
- Not Found
-
-
-
- Custom Page Not Found
-
-
+
+
+
+
+ Not Found
+
+
+ Custom Page Not Found
+
diff -u b/tests/html/fr.html b/tests/html/fr.html
--- b/tests/html/fr.html
+++ b/tests/html/fr.html
@@ -2,13 +2,11 @@
-
-
-
-
- Pas trouvé
-
-
-
- Page personnalisée introuvable
-
-
+
+
+
+
+ Pas trouvé
+
+
+ Page personnalisée introuvable
+