Merge branch 'release/1.0.0-rc.2'

getgrav · Oct 24, 2015 · fa4eef5 · fa4eef5
2 parents cf08d4f + 426f566
commit fa4eef5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git 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/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';

diff --git 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: