From b59893091c93c1a734f30b67ea64afc964e31077 Mon Sep 17 00:00:00 2001
From: Naz <nazargargol@gmail.com>
Date: Mon, 1 Mar 2021 19:41:30 +1300
Subject: [PATCH] Removed conditions which used @labs.members helper

refs https://github.com/TryGhost/Team/issues/332
refs https://github.com/TryGhost/gscan/commit/870a09b109a2747b9fd570f49df88f0d4c457d91

- The {{@labs.members}} always evaluates to "true" starting with Ghost 4.0 and will be "null" coercing to "false" starting Ghost 5.0
- Enabled all conditionals be default to pass the build in main Ghost repository. These changes should be reviewed - special attentio to the left out RSS feed which was surrounded with {{unless @labs.members}} condition
---
 default.hbs           |  2 --
 partials/site-nav.hbs | 17 +++++++----------
 post.hbs              |  4 +---
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/default.hbs b/default.hbs
index 456e676..366a7e3 100644
--- a/default.hbs
+++ b/default.hbs
@@ -49,7 +49,6 @@
     </div>
 
     {{!-- The big email subscribe modal content --}}
-    {{#if @labs.members}}
     <div class="subscribe-notification subscribe-success-message">
         <a class="subscribe-close-button" href="javascript:;"></a>
         You've successfully subscribed to {{@site.title}}!
@@ -58,7 +57,6 @@
         <a class="subscribe-close-button" href="javascript:;"></a>
         Could not sign up! Invalid sign up link.
     </div>
-    {{/if}}
 
     {{!-- jQuery, required for fitvids --}}
     <script
diff --git a/partials/site-nav.hbs b/partials/site-nav.hbs
index c7ad9cc..f771ece 100644
--- a/partials/site-nav.hbs
+++ b/partials/site-nav.hbs
@@ -28,17 +28,14 @@
                     <a class="social-link social-link-tw" href="{{twitter_url @site.twitter}}" title="Twitter" target="_blank" rel="noopener">{{> "icons/twitter"}}</a>
                 {{/if}}
             </div>
-            {{#unless @labs.members}}
-                <a class="rss-button" href="https://feedly.com/i/subscription/feed/{{@site.url}}/rss/" title="RSS" target="_blank" rel="noopener">{{> "icons/rss"}}</a>
-            {{/unless}}
+            <a class="rss-button" href="https://feedly.com/i/subscription/feed/{{@site.url}}/rss/" title="RSS" target="_blank" rel="noopener">{{> "icons/rss"}}</a>
         {{/if}}
 
-        {{#if @labs.members}}
-            {{#unless @member}}
-                <a class="subscribe-button" href="#subscribe">Subscribe</a>
-            {{else}}
-                <a class="subscribe-button" href="#/portal/account">Account</a>
-            {{/unless}}
-        {{/if}}
+        {{#unless @member}}
+            <a class="subscribe-button" href="#subscribe">Subscribe</a>
+        {{else}}
+            <a class="subscribe-button" href="#/portal/account">Account</a>
+        {{/unless}}
+
     </div>
 </nav>
diff --git a/post.hbs b/post.hbs
index f11d4c0..6479c31 100644
--- a/post.hbs
+++ b/post.hbs
@@ -110,9 +110,7 @@ into the {body} of the default.hbs template --}}
             </section>
 
             {{!-- Email subscribe form at the bottom of the page --}}
-            {{#if @labs.members}}
-                {{> subscribe-form}}
-            {{/if}}
+            {{> subscribe-form}}
 
             {{!--
             <section class="post-full-comments">