Add v3.22.0

YannickRe · Jul 1, 2020 · 59a5fdc · 59a5fdc
1 parent 240349e
commit 59a5fdc
Show file tree

Hide file tree

Showing 85 changed files with 2,833 additions and 1,715 deletions.
diff --git a/core/built/assets/auto-import-fastboot-d41d8cd98f00b204e9800998ecf8427e.js b/core/built/assets/auto-import-fastboot-d41d8cd98f00b204e9800998ecf8427e.js
diff --git a/...dark-8ee095ac927879af951b5615f4929a23.css → ...dark-42d2f397dce4146f4fb4310e26093b18.css b/...dark-8ee095ac927879af951b5615f4929a23.css → ...dark-42d2f397dce4146f4fb4310e26093b18.css
diff --git a/...t.min-3c26713e823b994471ac83f5b1685522.js → ...t.min-2771bb92414309724e37edd7267a3fab.js b/...t.min-3c26713e823b994471ac83f5b1685522.js → ...t.min-2771bb92414309724e37edd7267a3fab.js
diff --git a/....min-91b0f63b70e88354c76448098edb6c3e.css → ....min-3ad3e6cadea2dcc77ea742dc611db1c5.css b/....min-91b0f63b70e88354c76448098edb6c3e.css → ....min-3ad3e6cadea2dcc77ea742dc611db1c5.css
diff --git a/...r.min-f56780de5125e2a9ff22d96dd6d15441.js → ...r.min-8588d6e951f88d5f76ef7dcf04aa957a.js b/...r.min-f56780de5125e2a9ff22d96dd6d15441.js → ...r.min-8588d6e951f88d5f76ef7dcf04aa957a.js
diff --git a/core/frontend/apps/private-blogging/lib/views/private.hbs b/core/frontend/apps/private-blogging/lib/views/private.hbs
@@ -12,7 +12,6 @@
         <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
         <meta name="apple-mobile-web-app-capable" content="yes" />
 
-        <link rel="shortcut icon" href="{{asset "favicon.ico"}}">
         <meta http-equiv="cleartype" content="on">
 
         <link rel="stylesheet" href="{{asset "public/ghost.css" hasMinFile="true"}}"/>

diff --git a/core/frontend/helpers/ghost_head.js b/core/frontend/helpers/ghost_head.js
@@ -37,19 +37,15 @@ function finaliseStructuredData(metaData) {
 }
 
 function getMembersHelper() {
-    const stripePaymentProcessor = settingsCache.get('members_subscription_settings').paymentProcessors.find(
-        paymentProcessor => paymentProcessor.adapter === 'stripe'
-    );
-    const stripeSecretToken = stripePaymentProcessor.config.secret_token;
-    const stripePublicToken = stripePaymentProcessor.config.public_token;
-
-    const stripeConnectIntegration = settingsCache.get('stripe_connect_integration');
+    const stripeDirectSecretKey = settingsCache.get('stripe_secret_key');
+    const stripeDirectPublishableKey = settingsCache.get('stripe_publishable_key');
+    const stripeConnectAccountId = settingsCache.get('stripe_connect_account_id');
 
     let membersHelper = `<script defer src="${getAssetUrl('public/members.js', true)}"></script>`;
     if (config.get('enableDeveloperExperiments')) {
         membersHelper += `<script defer src="https://unpkg.com/@tryghost/members-js@latest/umd/members.min.js" data-ghost="${urlUtils.getSiteUrl()}"></script>`;
     }
-    if ((!!stripeSecretToken && !!stripePublicToken) || !!stripeConnectIntegration.account_id) {
+    if ((!!stripeDirectSecretKey && !!stripeDirectPublishableKey) || !!stripeConnectAccountId) {
         membersHelper += '<script src="https://js.stripe.com/v3/"></script>';
     }
     return membersHelper;
@@ -129,8 +125,12 @@ 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 + '" />');
+                }
 
-                head.push('<link rel="shortcut icon" href="' + favicon + '" type="image/' + iconType + '" />');
                 head.push('<link rel="canonical" href="' +
                     escapeExpression(metaData.canonicalUrl) + '" />');
                 head.push('<meta name="referrer" content="' + referrerPolicy + '" />');

diff --git a/core/frontend/meta/index.js b/core/frontend/meta/index.js
@@ -64,7 +64,7 @@ function getMetaData(data, root) {
             url: urlUtils.urlFor('home', true),
             facebook: settingsCache.get('facebook'),
             twitter: settingsCache.get('twitter'),
-            timezone: settingsCache.get('active_timezone'),
+            timezone: settingsCache.get('timezone'),
             navigation: settingsCache.get('navigation'),
             icon: settingsCache.get('icon'),
             cover_image: settingsCache.get('cover_image'),

diff --git a/core/frontend/services/routing/CollectionRouter.js b/core/frontend/services/routing/CollectionRouter.js
@@ -138,7 +138,7 @@ class CollectionRouter extends ParentRouter {
          * e.g. /:year/:month/:day/:slug/ or /:day/:slug/
          */
         this._onTimezoneEditedListener = this._onTimezoneEdited.bind(this);
-        events.on('settings.active_timezone.edited', this._onTimezoneEditedListener);
+        events.on('settings.timezone.edited', this._onTimezoneEditedListener);
     }
 
     /**
@@ -197,7 +197,7 @@ class CollectionRouter extends ParentRouter {
 
     reset() {
         if (this._onTimezoneEditedListener) {
-            events.removeListener('settings.active_timezone.edited', this._onTimezoneEditedListener);
+            events.removeListener('settings.timezone.edited', this._onTimezoneEditedListener);
         }
     }
 }

diff --git a/core/frontend/services/routing/bootstrap.js b/core/frontend/services/routing/bootstrap.js
@@ -81,13 +81,6 @@ module.exports.start = (apiVersion) => {
         registry.setRouter(staticRoutesRouter.identifier, staticRoutesRouter);
     });
 
-    _.each(dynamicRoutes.taxonomies, (value, key) => {
-        const taxonomyRouter = new TaxonomyRouter(key, value, RESOURCE_CONFIG);
-        siteRouter.mountRouter(taxonomyRouter.router());
-
-        registry.setRouter(taxonomyRouter.identifier, taxonomyRouter);
-    });
-
     _.each(dynamicRoutes.collections, (value, key) => {
         const collectionRouter = new CollectionRouter(key, value, RESOURCE_CONFIG);
         siteRouter.mountRouter(collectionRouter.router());
@@ -99,6 +92,13 @@ module.exports.start = (apiVersion) => {
 
     registry.setRouter('staticPagesRouter', staticPagesRouter);
 
+    _.each(dynamicRoutes.taxonomies, (value, key) => {
+        const taxonomyRouter = new TaxonomyRouter(key, value, RESOURCE_CONFIG);
+        siteRouter.mountRouter(taxonomyRouter.router());
+
+        registry.setRouter(taxonomyRouter.identifier, taxonomyRouter);
+    });
+
     const appRouter = new ParentRouter('AppsRouter');
     siteRouter.mountRouter(appRouter.router());