From 3daf46dcf8c3c81ca2eafaec391b5c9c172f53b8 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Wed, 13 Nov 2019 10:17:00 +0000
Subject: [PATCH] Display "all paid members" instead of incorrect count in
 email confirm modal

---
 ghost/admin/app/controllers/editor.js                       | 2 +-
 ghost/admin/app/templates/components/gh-publishmenu.hbs     | 6 +++++-
 .../app/templates/components/modal-confirm-email-send.hbs   | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ghost/admin/app/controllers/editor.js b/ghost/admin/app/controllers/editor.js
index 33e0c6d350..acabcb77f6 100644
--- a/ghost/admin/app/controllers/editor.js
+++ b/ghost/admin/app/controllers/editor.js
@@ -537,7 +537,7 @@ export default Controller.extend({
         }
     }).enqueue(),
 
-    // load supplementel data such as the actions list in the background
+    // load supplementel data such as the members count in the background
     backgroundLoader: task(function* () {
         if (this.feature.members) {
             let membersResponse = yield this.store.query('member', {limit: 1});
diff --git a/ghost/admin/app/templates/components/gh-publishmenu.hbs b/ghost/admin/app/templates/components/gh-publishmenu.hbs
index 8eeef53ee4..a274e054d6 100644
--- a/ghost/admin/app/templates/components/gh-publishmenu.hbs
+++ b/ghost/admin/app/templates/components/gh-publishmenu.hbs
@@ -53,7 +53,11 @@
 {{#if showEmailConfirmationModal}}
     <GhFullscreenModal
         @modal="confirm-email-send"
-        @model={{hash memberCount=this.memberCount isScheduled=(eq this.saveType "schedule")}}
+        @model={{hash
+            memberCount=this.memberCount
+            isScheduled=(eq this.saveType "schedule")
+            paidOnly=(eq this.post.visibility "paid")
+        }}
         @confirm={{this.confirmEmailSend}}
         @close={{this.closeEmailConfirmationModal}}
         @modifier="action wide"
diff --git a/ghost/admin/app/templates/components/modal-confirm-email-send.hbs b/ghost/admin/app/templates/components/modal-confirm-email-send.hbs
index 00b860754f..d19f3bb455 100644
--- a/ghost/admin/app/templates/components/modal-confirm-email-send.hbs
+++ b/ghost/admin/app/templates/components/modal-confirm-email-send.hbs
@@ -4,7 +4,10 @@
 <a class="close" href="" title="Close" {{action "closeModal"}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
 
 <div class="modal-body">
-    <p><strong>PLEASE NOTE:</strong> You are about to email this post to <strong>{{pluralize this.model.memberCount "member"}}</strong>.</p>
+    <p>
+        <strong>PLEASE NOTE:</strong> You are about to email this post to
+        <strong>{{if this.model.paidOnly "all paid members" (pluralize this.model.memberCount "member")}}</strong>.
+    </p>
     <ul>
         {{#if this.model.isScheduled}}
         <li>Email will be sent when the post is published at the scheduled time</li>