From 3f176c1924e2ce1a40c28d0ae7521133cb75902f Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Thu, 27 Jun 2019 17:59:05 +0300
Subject: [PATCH] Changelog update

---
 CHANGELOG.md                                 |  1 +
 system/src/Grav/Common/Language/Language.php | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 574fb9f8e..a86ec0268 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@
     * Fixed some potential issues when `$grav['user']` is not set
     * Fixed `.md` page to be assigned to the default language and to be listed in translated/untranslated page list
     * Fixed `Language::getFallbackPageExtensions()` to append `.md` file after the default language extension
+    * Fixed `Language::getFallbackPageExtensions()` returning wrong file extensions when passing custom page extension
 
 # v1.6.11
 ## 06/21/2019
diff --git a/system/src/Grav/Common/Language/Language.php b/system/src/Grav/Common/Language/Language.php
index cc389dc8f..3891b443d 100644
--- a/system/src/Grav/Common/Language/Language.php
+++ b/system/src/Grav/Common/Language/Language.php
@@ -58,7 +58,7 @@ class Language
             $this->default = reset($this->languages);
         }
 
-        $this->page_extensions = null;
+        $this->page_extensions = [];
 
         if (empty($this->languages)) {
             $this->enabled = false;
@@ -285,7 +285,9 @@ class Language
      */
     public function getFallbackPageExtensions($file_ext = null)
     {
-        if (empty($this->page_extensions)) {
+        $file_ext = (string)$file_ext;
+
+        if (!isset($this->page_extensions[$file_ext])) {
             if (!$file_ext) {
                 $file_ext = CONTENT_EXT;
             }
@@ -320,13 +322,13 @@ class Language
                     }
                 }
 
-                $this->page_extensions = array_values($valid_lang_extensions);
+                $this->page_extensions[$file_ext] = array_values($valid_lang_extensions);
             } else {
-                $this->page_extensions = (array)$file_ext;
+                $this->page_extensions[$file_ext] = (array)$file_ext;
             }
         }
 
-        return $this->page_extensions;
+        return $this->page_extensions[$file_ext];
     }
 
     /**
@@ -342,7 +344,7 @@ class Language
      */
     public function resetFallbackPageExtensions()
     {
-        $this->page_extensions = null;
+        $this->page_extensions = [];
     }
 
     /**