From f0f8cd6c7fd49f96c30789012c34ea841fc2cd36 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Fri, 23 Oct 2015 19:51:02 -0600 Subject: [PATCH 1/2] Back out lang removal code as it is causing problems --- admin.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/admin.php b/admin.php index 8b20dce61..a10fe9cb1 100644 --- a/admin.php +++ b/admin.php @@ -357,11 +357,11 @@ protected function initializeAdmin() } /** @var Language $language */ - $require_language = ['pages', 'translations']; - $language = $this->grav['language']; - if ($language->isLanguageInUrl() && !in_array($this->template, $require_language)) { - $this->grav->redirect($this->uri->route()); - } +// $require_language = ['pages', 'translations']; +// $language = $this->grav['language']; +// if ($language->isLanguageInUrl() && !in_array($this->template, $require_language)) { +// $this->grav->redirect($this->uri->route()); +// } // Initialize admin class. require_once __DIR__ . '/classes/admin.php'; From 426f5661ebbc776673f05cef77eeb785c1c09148 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Fri, 23 Oct 2015 19:52:26 -0600 Subject: [PATCH 2/2] version update --- CHANGELOG.md | 6 ++++++ blueprints.yaml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 527245fba..25331de52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.0.0-rc.2 +## 10/23/2015 + +1. [](#bugfix) + * Reverted lang redirect code. Needs to be reworked to be more reliable + # v1.0.0-rc.1 ## 10/23/2015 diff --git a/blueprints.yaml b/blueprints.yaml index 77baa94d3..d36526b15 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Admin Panel -version: 1.0.0-rc.1 +version: 1.0.0-rc.2 description: Adds an advanced administration panel to manage your site icon: empire author: