-----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQTqYa7kNs8D7Oo9dgLSEYbwtHKVrQUCYNR3tAAKCRDSEYbwtHKV
 rXcMAQDQd7EcEmIx3sHlA5wjMz9SMZaybaOqLMzgCdUft2KOagD/dFtZBYpK4DLB
 Kr42XrNMVvORHNPso5lL35s9KNbTlwM=
 =OqBv
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQTqYa7kNs8D7Oo9dgLSEYbwtHKVrQUCYNR4ygAKCRDSEYbwtHKV
 rXtsAQDNUqm3qK0b8/hET9h7cIG5J5RpAo0WYJWxv01DwcTscAEAjlfK3vgUo3wD
 uHeeXH+DXOIhAqSxsXoJr7X+N/s+WQw=
 =BJTH
 -----END PGP SIGNATURE-----

Merged v4.8.2 into main

v4.8.2
This commit is contained in:
Daniel Lockyer 2021-06-24 13:21:23 +01:00
commit e389a6d991
3 changed files with 3 additions and 3 deletions

@ -1 +1 @@
Subproject commit 4c4fcdad486670e9202f8ca22f77c4333c3bb3ec
Subproject commit 7c8de6c1ed29e89ad5bde6b701b9580bcc6cdab8

View File

@ -69,7 +69,7 @@ module.exports = function (Bookshelf) {
// and append default columns to fetch
if (options.columns) {
options.columns = _.intersection(options.columns, this.prototype.permittedAttributes());
options.columns = _.union(options.columns, this.prototype.defaultColumnsToFetch());
options.columns = _.union(options.columns, this.defaultColumnsToFetch());
}
if (options.order) {

View File

@ -1,6 +1,6 @@
{
"name": "ghost",
"version": "4.8.1",
"version": "4.8.2",
"description": "The professional publishing platform",
"author": "Ghost Foundation",
"homepage": "https://ghost.org",