tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.7.1' into 3.7

Browse Source
This commit is contained in:
Daniel Hensby 2018-07-17 20:52:12 +01:00
commit d430763a87
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/install/install.php5
View File

@ -1232,11 +1232,11 @@ class InstallRequirements {
}
public function hasErrors() {
return sizeof($this->errors);
return empty($this->errors) ? 0 : sizeof($this->errors);
}
public function hasWarnings() {
return sizeof($this->warnings);
return empty($this->warnings) ? 0 : sizeof($this->warnings);
}
}

13
docs/en/04_Changelogs/3.7.1.md Normal file
View File

@ -0,0 +1,13 @@
# 3.7.1
<!--- Changes below this line will be automatically regenerated -->
## Change Log
### Bugfixes
* 2018-07-17 [e38c30f](https://github.com/silverstripe/silverstripe-framework/commit/e38c30ff0d9e4ae8ae31a59836fb8e9891f559a5) sizeof doesnt work with null types (Daniel Hensby)
* 2018-06-19 [58bd6c2](https://github.com/silverstripe/silverstripe-framework/commit/58bd6c2248282b9ef6fb940cc6792a7b8c436fbf) Switch to Trusty in Travis (Robbie Averill)
* 2018-06-11 [07112db](https://github.com/silverstripe/silverstripe-cms/commit/07112dbb0bbc4bd624e44586ef3faccdcff1acd1) Remove blind reliance on current versioning stage being valid (Guy)
* 2018-06-11 [02cd32a](https://github.com/silverstripe/silverstripe-framework/commit/02cd32acb3db7b8e3ec5b3617ce6fb5c84fca9d8) Error if invalid stage specified for get_by_stage (Damian Mooyman)
* 2018-06-09 [42e799b](https://github.com/silverstripe/silverstripe-framework/commit/42e799bc43eb83660bc4d35c9c6c5bf7f23989a8) Versioned::choose_site_stage() if no request given (Florian Thoma)