Merge branch 'feature/non-standard-slugs' into develop

# Conflicts: # CHANGELOG.md
getgrav · Apr 27, 2016 · 1f24ab3 · 1f24ab3
2 parents 91b2917 + 4573173
commit 1f24ab3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/system/blueprints/pages/default.yaml b/system/blueprints/pages/default.yaml
@@ -2,7 +2,7 @@ title: PLUGIN_ADMIN.DEFAULT
 
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: "[a-zа-я][a-zа-я0-9_\-]+"
     min: 2
     max: 80
 

diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
@@ -105,7 +105,7 @@ private function buildUri()
     {
         $uri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
 
-        return $uri;
+        return rawurldecode($uri);
     }
 
     private function buildScheme()
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ title: PLUGIN_ADMIN.DEFAULT @@
     rules:
       slug:
-        pattern: "[a-z][a-z0-9_\-]+"
+        pattern: "[a-zа-я][a-zа-я0-9_\-]+"
         min: 2
         max: 80
@@ Expand Down @@