Add v3.22.1

YannickRe · Jul 1, 2020 · 6ae49e4 · 6ae49e4
1 parent 59a5fdc
commit 6ae49e4
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 23 deletions.
diff --git a/...t.min-2771bb92414309724e37edd7267a3fab.js → ...t.min-cba13e219672748422f899175524238d.js b/...t.min-2771bb92414309724e37edd7267a3fab.js → ...t.min-cba13e219672748422f899175524238d.js
diff --git a/core/frontend/helpers/ghost_foot.js b/core/frontend/helpers/ghost_foot.js
@@ -9,7 +9,7 @@ const _ = require('lodash');
 module.exports = function ghost_foot(options) { // eslint-disable-line camelcase
     const foot = [];
 
-    const globalCodeinjection = settingsCache.get('ghost_foot');
+    const globalCodeinjection = settingsCache.get('codeinjection_foot');
     const postCodeinjection = options.data.root && options.data.root.post ? options.data.root.post.codeinjection_foot : null;
 
     if (!_.isEmpty(globalCodeinjection)) {

diff --git a/core/frontend/helpers/ghost_head.js b/core/frontend/helpers/ghost_head.js
@@ -99,7 +99,7 @@ module.exports = function ghost_head(options) { // eslint-disable-line camelcase
     const context = dataRoot._locals.context ? dataRoot._locals.context : null;
     const safeVersion = dataRoot._locals.safeVersion;
     const postCodeInjection = dataRoot && dataRoot.post ? dataRoot.post.codeinjection_head : null;
-    const globalCodeinjection = settingsCache.get('ghost_head');
+    const globalCodeinjection = settingsCache.get('codeinjection_head');
     const useStructuredData = !config.isPrivacyDisabled('useStructuredData');
     const referrerPolicy = config.get('referrerPolicy') ? config.get('referrerPolicy') : 'no-referrer-when-downgrade';
     const favicon = blogIcon.getIconUrl();
@@ -125,7 +125,7 @@ module.exports = function ghost_head(options) { // eslint-disable-line camelcase
                 if (metaData.metaDescription && metaData.metaDescription.length > 0) {
                     head.push('<meta name="description" content="' + escapeExpression(metaData.metaDescription) + '" />');
                 }
-                
+
                 // no output in head if a publication icon is not set
                 if (settingsCache.get('icon')) {
                     head.push('<link rel="icon" href="' + favicon + '" type="image/' + iconType + '" />');

diff --git a/core/frontend/services/themes/middleware.js b/core/frontend/services/themes/middleware.js
@@ -72,7 +72,7 @@ function haxGetMembersPriceData() {
         }, {});
 
         priceData.currency = stripePlans[0].currency;
-        priceData.currency_symbol = CURRENCY_SYMBOLS[priceData.currency];
+        priceData.currency_symbol = CURRENCY_SYMBOLS[priceData.currency.toUpperCase()];
 
         if (Number.isInteger(priceData.monthly) && Number.isInteger(priceData.yearly)) {
             return priceData;

diff --git a/core/server/index.js b/core/server/index.js
@@ -130,8 +130,10 @@ const minimalRequiredSetupToStartGhost = (dbState) => {
 
                 migrator.migrate()
                     .then(() => {
-                        events.emit('db.ready');
-                        return initialiseServices();
+                        return settings.reinit().then(() => {
+                            events.emit('db.ready');
+                            return initialiseServices();
+                        });
                     })
                     .then(() => {
                         config.set('maintenance:enabled', false);

diff --git a/core/server/services/settings/index.js b/core/server/services/settings/index.js
@@ -14,5 +14,10 @@ module.exports = {
                 // This will bind to events for further updates
                 SettingsCache.init(settingsCollection);
             });
+    },
+
+    reinit: function reinit() {
+        SettingsCache.shutdown();
+        return this.init();
     }
 };
diff --git a/core/server/web/admin/views/default-prod.html b/core/server/web/admin/views/default-prod.html
@@ -53,7 +53,7 @@
 
 
                 <script src="assets/vendor.min-8588d6e951f88d5f76ef7dcf04aa957a.js"></script>
-                <script src="assets/ghost.min-2771bb92414309724e37edd7267a3fab.js"></script>
+                <script src="assets/ghost.min-cba13e219672748422f899175524238d.js"></script>
 
 </body>
 </html>
diff --git a/core/server/web/admin/views/default.html b/core/server/web/admin/views/default.html
@@ -53,7 +53,7 @@
 
 
                 <script src="assets/vendor.min-8588d6e951f88d5f76ef7dcf04aa957a.js"></script>
-                <script src="assets/ghost.min-2771bb92414309724e37edd7267a3fab.js"></script>
+                <script src="assets/ghost.min-cba13e219672748422f899175524238d.js"></script>
 
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "3.22.0",
+  "version": "3.22.1",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",