From 4573173456245f9d385ad69df10c2fd918e2fcf8 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Wed, 27 Apr 2016 13:36:12 -0600
Subject: [PATCH] Allow Cyrillic slugs

---
 CHANGELOG.md                         | 1 +
 system/blueprints/pages/default.yaml | 2 +-
 system/src/Grav/Common/Uri.php       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe44e2aa09..90fb434ada 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
     * Moved to new `data-*@` format in blueprints
 1. [](#bugfix)
     * Fixed issue with link rewrites and local assets pipeline with `absolute_urls: true`
+    * Allow Cyrillic slugs
 
 # v1.1.0-beta.1
 ## 04/20/2016
diff --git a/system/blueprints/pages/default.yaml b/system/blueprints/pages/default.yaml
index c5f79c9ed1..c7338fd9d3 100644
--- 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
index 7a9e536e7b..a760e504b5 100644
--- 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()