From 4730c82b3a41312f5eb9dfce4fdcedc6148874d3 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 9 Jun 2016 14:51:38 -0400
Subject: [PATCH] FIX: Detect `window.opener`

---
 app/views/users/omniauth_callbacks/complete.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/users/omniauth_callbacks/complete.html.erb b/app/views/users/omniauth_callbacks/complete.html.erb
index b710e81d1..c8517a294 100644
--- a/app/views/users/omniauth_callbacks/complete.html.erb
+++ b/app/views/users/omniauth_callbacks/complete.html.erb
@@ -22,7 +22,9 @@
     <p><%=t "login.close_window" %></p>
 
     <script type="text/javascript">
-       window.opener.Discourse.authenticationComplete(<%=@auth_result.to_client_hash.to_json.html_safe%>);
+       if (window.opener) {
+         window.opener.Discourse.authenticationComplete(<%=@auth_result.to_client_hash.to_json.html_safe%>);
+       }
 
        // On facebook browser, just redirect and don't close
        var ua = navigator.userAgent || navigator.vendor || window.opera;