Merge branch 'release/1.3.1'

This commit is contained in:
Andy Miller
2017-07-19 12:15:38 -06:00
5 changed files with 12 additions and 4 deletions

View File

@@ -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]

View File

@@ -1,3 +1,11 @@
# v1.3.1
## 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

View File

@@ -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', '/');

View File

@@ -367,7 +367,7 @@ class Medium extends Data implements RenderableInterface
$this->mode = $mode;
return $mode === 'thumbnail' ? $this->getThumbnail()->reset() : $this->reset();
return $mode === 'thumbnail' ? ($this->getThumbnail() ? $this->getThumbnail()->reset() : null) : $this->reset();
}
/**

View File

@@ -1259,7 +1259,7 @@ class Pages
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);
}