Merge branch 'release/1.6.27'

getgrav · Sep 1, 2020 · 75cb4e3 · 75cb4e3
2 parents fa791ed + 6e8c852
commit 75cb4e3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v1.6.27
+## 09/01/2020
+
+1. [](#improved)
+    * Right trim route for safety
+    * Use the proper ellipsis for summary [#2939](https://github.com/getgrav/grav/pull/2939)
+    * Left pad schedule times with zeros [#2921](https://github.com/getgrav/grav/pull/2921)
+
 # v1.6.26
 ## 06/08/2020
 

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

diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
@@ -608,7 +608,7 @@ public function summary($size = null, $textOnly = false)
                 return $content;
             }
 
-            return mb_strimwidth($content, 0, $size, '...', 'UTF-8');
+            return mb_strimwidth($content, 0, $size, '…', 'UTF-8');
         }
 
         $summary = Utils::truncateHtml($content, $size);

diff --git a/system/src/Grav/Common/Scheduler/Cron.php b/system/src/Grav/Common/Scheduler/Cron.php
@@ -69,7 +69,7 @@ class Cron
             'name_year' => 'année',
             'text_period' => 'Chaque %s',
             'text_mins' => 'à %s minutes',
-            'text_time' => 'à %s:%s',
+            'text_time' => 'à %02s:%02s',
             'text_dow' => 'le %s',
             'text_month' => 'de %s',
             'text_dom' => 'le %s',
@@ -86,7 +86,7 @@ class Cron
             'name_year' => 'year',
             'text_period' => 'Every %s',
             'text_mins' => 'at %s minutes past the hour',
-            'text_time' => 'at %s:%s',
+            'text_time' => 'at %02s:%02s',
             'text_dow' => 'on %s',
             'text_month' => 'of %s',
             'text_dom' => 'on the %s',

diff --git a/system/src/Grav/Framework/Route/Route.php b/system/src/Grav/Framework/Route/Route.php
@@ -286,7 +286,7 @@ public function toString(bool $includeRoot = false)
             $url .= '?' . $this->getUriQuery();
         }
 
-        return $url;
+        return rtrim($url,'/');
     }
 
     /**