Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
Add v2.17.2
Browse files Browse the repository at this point in the history
  • Loading branch information
YannickRe committed Mar 13, 2019
1 parent 0dd25cd commit 43f94d9
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 25 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions core/server/data/meta/context_object.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,19 @@ function getContextObject(data, context) {
// @TODO: meta layer is very broken, it's really hard to understand what it's doing
// The problem is that handlebars root object is structured differently. Sometimes the object is flat on data
// and sometimes the object is part of a key e.g. data.post. This needs to be prepared at the very first stage and not in each helper.
if (_.includes(context, 'page') || _.includes(context, 'amp') && data.post) {
if ((_.includes(context, 'page') || _.includes(context, 'amp')) && data.post) {
chosenContext = data.post;
} else if (_.includes(context, 'post') && data.post) {
chosenContext = data.post;
} else if (_.includes(context, 'page') && data.page) {
chosenContext = data.page;
} else if (data[context]) {
// @NOTE: This is confusing as hell. It tries to get data[['author']], which works, but coincidence?
chosenContext = data[context];
} else {
}

// Super fallback.
if (!chosenContext) {
chosenContext = blog;
}

Expand Down
2 changes: 1 addition & 1 deletion core/server/web/admin/views/default-prod.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<div id="ember-basic-dropdown-wormhole"></div>


<script src="assets/vendor.min-fc9a04157ae848a1a14ac38d789177b6.js"></script>
<script src="assets/vendor.min-12fba91cf6b912259eb65b3fdbf2b716.js"></script>
<script src="assets/ghost.min-dfb261a6638a47727c8d04a9e66f6b3f.js"></script>

</body>
Expand Down
2 changes: 1 addition & 1 deletion core/server/web/admin/views/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<div id="ember-basic-dropdown-wormhole"></div>


<script src="assets/vendor.min-fc9a04157ae848a1a14ac38d789177b6.js"></script>
<script src="assets/vendor.min-12fba91cf6b912259eb65b3fdbf2b716.js"></script>
<script src="assets/ghost.min-dfb261a6638a47727c8d04a9e66f6b3f.js"></script>

</body>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ghost",
"version": "2.17.1",
"version": "2.17.2",
"description": "The professional publishing platform",
"author": "Ghost Foundation",
"homepage": "https://ghost.org",
Expand Down

0 comments on commit 43f94d9

Please sign in to comment.