fix logout error issue shane-tomlinson#92

krydos · Mar 15, 2014 · 34d0276 · 34d0276
1 parent eaf24cd
commit 34d0276
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/browserid.js b/browserid.js
@@ -39,8 +39,6 @@
   // script is run. Attach a live event (yuck) so that the user is still
   // able to log out.
   liveEvent(".js-persona__logout", "click", function(event) {
-    event.preventDefault();
-
     ignoreLogout = false;
     navigator.id.logout();
   });
@@ -207,13 +205,6 @@
       // the user leaving a comment but not being logged in. Either way,
       // do not redirect the user, they are where they want to be.
       if (ignoreLogout) return;
-
-      // There is a bug in Persona with Chrome. When a user signs in, the
-      // onlogout callback is first fired. Check if a user is actually
-      // signed in before redirecting to the logout URL.
-      if (browserid_common.loggedInUser) {
-        document.location = browserid_common.urlLogoutRedirect;
-      }
     }
   });
 

diff --git a/browserid.min.js b/browserid.min.js
diff --git a/lib/browserid-admin.php b/lib/browserid-admin.php
@@ -96,7 +96,7 @@ public function Admin_toolbar_replace_logout_action($wp_toolbar) {
 					'id' => 'logout',
 					'title' => $this->logout_html,
 					'parent' => 'user-actions',
-					'href' => '#',
+					'href' => wp_logout_url(),
 					'meta' => array(
 						'class' => 'js-persona__logout'
 					)