Merge branch 'release/1.1.1'

getgrav · Jul 16, 2016 · 1a1b291 · 1a1b291
2 parents 231bc81 + 6e6ff7c
commit 1a1b291
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# v1.1.1
+## 07/16/2016
+
+1. [](#improved)
+    * Made `paramsRegex()` static to allow it to be called statically
+1. [](#bugfix)
+    * Fixed backup when using very long site titles with invalid characters [grav-plugin-admin#701](https://github.com/getgrav/grav-plugin-admin/issues/701)
+    * Fixed a typo in the `webserver-configs/nginx.conf` example
+
 # v1.1.0
 ## 07/14/2016
 

diff --git a/system/defines.php b/system/defines.php
@@ -8,7 +8,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.1.0');
+define('GRAV_VERSION', '1.1.1');
 define('GRAV_TESTING', false);
 define('DS', '/');
 define('GRAV_PHP_MIN', '5.5.9');

diff --git a/system/src/Grav/Common/Backup/ZipBackup.php b/system/src/Grav/Common/Backup/ZipBackup.php
@@ -46,7 +46,7 @@ public static function backup($destination = null, callable $messager = null)
             }
         }
 
-        $name = Grav::instance()['config']->get('site.title', basename(GRAV_ROOT));
+        $name = substr(strip_tags(Grav::instance()['config']->get('site.title', basename(GRAV_ROOT))), 0, 20);
 
         $inflector = new Inflector();
 

diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
@@ -78,7 +78,7 @@ private function buildHostname()
      *
      * @return string
      */
-    public function paramsRegex()
+    public static function paramsRegex()
     {
         return '/\/([^\:\#\/\?]*' . Grav::instance()['config']->get('system.param_sep') . '[^\:\#\/\?]*)/';
     }

diff --git a/webserver-configs/nginx.conf b/webserver-configs/nginx.conf
@@ -12,7 +12,7 @@ server {
     # `location /subfolder {`
     # and the rewrite to use `/subfolder/index.php`
     location / {
-        location / { try_files $uri $uri/ /index.php?_url=$uri; }
+        try_files $uri $uri/ /index.php?_url=$uri;
     }
     ## End - Index
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            $name = Grav::instance()['config']->get('site.title', basename(GRAV_ROOT));
+            $name = substr(strip_tags(Grav::instance()['config']->get('site.title', basename(GRAV_ROOT))), 0, 20);
             $inflector = new Inflector();
@@ Expand Down @@