From 3dc0a2994b7f51d583d64afa6b1e628ff778a230 Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Sun, 16 Jul 2017 17:17:57 -0600 Subject: [PATCH 1/5] Updated Access Token --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 56943a340a..7c543eac51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ env: - GOPATH="$HOME/go" - PATH="$GOPATH/bin:$PATH" # GH_TOKEN [API Key] - - secure: "jS+c+g2v33vypG4VtqiSDW2qQ4dGJZlrUKBRCztoy1yrOrYRPvc5Vzi/AS3fDmZ4yizukEwmUNNzyZQcgFvLPpmCCml46Dovp8R9OXhbNe8OnULmaSn2Zkr71oblMYu6ZP+RpYvNq0BIdSB3u2TiFriHMiTIkX9UwZNaUCOX1ig=" + - secure: "NR9pV7YteY9OoPmjDTQG0fDfocVu+tCeiDH1F2GFhXCu71UOIvqWXpOxp0RHkG5GIXdCFHx59yu+ZO275lbaHkbF8+4lVSVrV4RcGn+pIncvxr6iZCVW05dbAxV3H8alK+xYJRGmbyfQl5wIM49WvmuGHZjcmIloS4t/omQ3N+I=" # BB_TOKEN value => "user:pass@" - secure: "einUtSEkUWy2IrqLXyVjwUU+mwaaoiOXRRVdLBpA3Zye6bZx8cm5h/5AplkPWhM/NmCJoW/MwNZHHkFhlr3mDRov5iOxVmTTYfnXB+I5lxYTSgduOLLErS7mU8hfADpVDU8bHNU44fNGD3UEiG1PD4qQBX4DMlqIFmR20mjs81k=" # GH_API_USER [for curl] From cd081b22a4903d1a24449678e4d1a393b75ef7f6 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Mon, 17 Jul 2017 18:08:03 +0200 Subject: [PATCH 2/5] Fix ordering in linux+intl environments (#1571) Added for next point release --- system/src/Grav/Common/Page/Pages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php index 3d9762684a..a7657dff1a 100644 --- a/system/src/Grav/Common/Page/Pages.php +++ b/system/src/Grav/Common/Page/Pages.php @@ -1259,7 +1259,7 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual if ($col) { if (($sort_flags & SORT_NATURAL) === SORT_NATURAL) { $list = preg_replace_callback('~([0-9]+)\.~', function($number) { - return sprintf('%032d', $number); + return sprintf('%032d', $number[0]); }, $list); } From c178b22c109450b54b4bcdd009dd86bb1b09a211 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Mon, 17 Jul 2017 18:10:00 +0200 Subject: [PATCH 3/5] Check if medium thumbnail exists before resetting --- CHANGELOG.md | 6 ++++++ system/src/Grav/Common/Page/Medium/Medium.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83938af6eb..01ecd76a4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.3.1 +## 07/xx/2017 + +1. [](#bugfix) + * Check if medium thumbnail exists before resetting + # v1.3.0 ## 07/16/2017 diff --git a/system/src/Grav/Common/Page/Medium/Medium.php b/system/src/Grav/Common/Page/Medium/Medium.php index d63f12ed71..e817375b98 100644 --- a/system/src/Grav/Common/Page/Medium/Medium.php +++ b/system/src/Grav/Common/Page/Medium/Medium.php @@ -367,7 +367,7 @@ public function display($mode = 'source') $this->mode = $mode; - return $mode === 'thumbnail' ? $this->getThumbnail()->reset() : $this->reset(); + return $mode === 'thumbnail' ? ($this->getThumbnail() ? $this->getThumbnail()->reset() : null) : $this->reset(); } /** From bbc4a23c8677d2aaede594ca3a965d584559e5b6 Mon Sep 17 00:00:00 2001 From: Tim Robbings Date: Mon, 17 Jul 2017 22:47:53 +0100 Subject: [PATCH 4/5] Fix default sort order (#1575) This appears to have broken page ordering. Test-information: Did a quick test on a personal project, clearing cache and reloading the page fixed the default sort order of the navbar (i.e. it displayed according to numeric folder prefixes). --- system/src/Grav/Common/Page/Pages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php index a7657dff1a..08f96fd17f 100644 --- a/system/src/Grav/Common/Page/Pages.php +++ b/system/src/Grav/Common/Page/Pages.php @@ -1259,7 +1259,7 @@ protected function buildSort($path, array $pages, $order_by = 'default', $manual if ($col) { if (($sort_flags & SORT_NATURAL) === SORT_NATURAL) { $list = preg_replace_callback('~([0-9]+)\.~', function($number) { - return sprintf('%032d', $number[0]); + return sprintf('%032d.', $number[0]); }, $list); } From f6667077f3be14a86a2710ab9c6fbc2b5f7eaa05 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 19 Jul 2017 12:15:30 -0600 Subject: [PATCH 5/5] Prepare for release --- CHANGELOG.md | 4 +++- system/defines.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01ecd76a4a..eefb41e0e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ # v1.3.1 -## 07/xx/2017 +## 07/19/2017 1. [](#bugfix) + * Fix ordering for Linux + International environments [#1574](https://github.com/getgrav/grav/issues/1574) * Check if medium thumbnail exists before resetting + * Update Travis' auth token # v1.3.0 ## 07/16/2017 diff --git a/system/defines.php b/system/defines.php index f014a65b91..1665c4beca 100644 --- a/system/defines.php +++ b/system/defines.php @@ -8,7 +8,7 @@ // Some standard defines define('GRAV', true); -define('GRAV_VERSION', '1.3.0'); +define('GRAV_VERSION', '1.3.1'); //define('GRAV_TESTING', true); define('DS', '/');