From e36b9360e713122e94b1ff20f93862ef2ee34ab7 Mon Sep 17 00:00:00 2001
From: Rish <zrishabhgarg@gmail.com>
Date: Tue, 24 Nov 2020 22:47:29 +0530
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20support=20and=20powered?=
 =?UTF-8?q?=20by=20links=20not=20working?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes https://github.com/TryGhost/Ghost/issues/12367

- Support and powered by links were not opened through `href` inside iframe
- Adds support to open these links via `window.open` to bypass iframe restriction
---
 ghost/portal/src/components/PopupModal.js               | 8 +++++++-
 ghost/portal/src/components/common/PopupNotification.js | 4 +++-
 ghost/portal/src/components/pages/AccountHomePage.js    | 4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ghost/portal/src/components/PopupModal.js b/ghost/portal/src/components/PopupModal.js
index 83c18c0905..03519dac02 100644
--- a/ghost/portal/src/components/PopupModal.js
+++ b/ghost/portal/src/components/PopupModal.js
@@ -152,7 +152,13 @@ class PopupContent extends React.Component {
                     {this.renderPopupNotification()}
                     {this.renderActivePage()}
                 </div>
-                <div className={'gh-portal-powered' + (hasMode(['preview']) ? ' hidden' : '')}><a href='https://ghost.org' target='_blank' rel='noopener noreferrer'><PoweredIcon /> <span>Publish with Ghost</span></a></div>
+                <div className={'gh-portal-powered' + (hasMode(['preview']) ? ' hidden' : '')}>
+                    <a href='https://ghost.org' target='_blank' rel='noopener noreferrer' onClick={() => {
+                        window.open('https://ghost.org', '_blank');
+                    }}>
+                        <PoweredIcon /> <span>Publish with Ghost</span>
+                    </a>
+                </div>
             </div>
         );
     }
diff --git a/ghost/portal/src/components/common/PopupNotification.js b/ghost/portal/src/components/common/PopupNotification.js
index 64214717b4..6d9205cdb4 100644
--- a/ghost/portal/src/components/common/PopupNotification.js
+++ b/ghost/portal/src/components/common/PopupNotification.js
@@ -107,7 +107,9 @@ const NotificationText = ({message, site}) => {
         );
     }
     return (
-        <p> An unexpected error occured. Please try again or <a href={supportAddressMail}>contact support</a> if the error persists.</p>
+        <p> An unexpected error occured. Please try again or <a href={supportAddressMail} onClick={() => {
+            supportAddressMail && window.open(supportAddressMail);
+        }}>contact support</a> if the error persists.</p>
     );
 };
 
diff --git a/ghost/portal/src/components/pages/AccountHomePage.js b/ghost/portal/src/components/pages/AccountHomePage.js
index 03fff55b53..1f9d948365 100644
--- a/ghost/portal/src/components/pages/AccountHomePage.js
+++ b/ghost/portal/src/components/pages/AccountHomePage.js
@@ -111,7 +111,9 @@ const AccountFooter = ({onClose, handleSignout, supportAddress = ''}) => {
             </ul>
             <div className='gh-portal-account-footerright'>
                 <ul className='gh-portal-account-footermenu'>
-                    <li><a className='gh-portal-btn gh-portal-btn-branded' href={supportAddressMail}>Contact support</a></li>
+                    <li><a className='gh-portal-btn gh-portal-btn-branded' href={supportAddressMail} onClick={() => {
+                        supportAddressMail && window.open(supportAddressMail);
+                    }}>Contact support</a></li>
                 </ul>
             </div>
         </footer>