From e2db025aa0aada571de0996e018529bed94727f6 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Wed, 1 Jul 2015 20:50:36 -0600
Subject: [PATCH] minor updates

---
 system/config/system.yaml             | 4 ----
 system/src/Grav/Common/Page/Pages.php | 4 +---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/system/config/system.yaml b/system/config/system.yaml
index 4ea2df0f3..4d59ee364 100644
--- a/system/config/system.yaml
+++ b/system/config/system.yaml
@@ -5,10 +5,6 @@ param_sep: ':'                         # Parameter separator, use ';' for Apache
 home:
   alias: '/home'                       # Default path for home, ie /
 
-languages:                             # Supported languages
-    - en
-    - fr
-
 pages:
   theme: antimatter                    # Default theme (defaults to "antimatter" theme)
   order:
diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index 949cab08e..c9c88a1a2 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -490,9 +490,7 @@ class Pages
                     $last_modified = Folder::lastModifiedFile($pagesDir);
             }
 
-            $lang_key = $this->active_language ?: '';
-
-            $page_cache_id = md5(USER_DIR.$last_modified.$lang_key.$config->checksum());
+            $page_cache_id = md5(USER_DIR.$last_modified.$language->getActive().$config->checksum());
 
             list($this->instances, $this->routes, $this->children, $taxonomy_map, $this->sort) = $cache->fetch($page_cache_id);
             if (!$this->instances) {