Skip to content

Commit 1b002b2

Browse files
Tugastralbodies
authored andcommitted
Revert to using legacy logout if login/wp-login is disabled
1 parent 0353505 commit 1b002b2

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

client/me/sidebar/index.jsx

+9-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ const Sidebar = require( 'layout/sidebar' ),
1818
config = require( 'config' ),
1919
ProfileGravatar = require( 'me/profile-gravatar' ),
2020
eventRecorder = require( 'me/event-recorder' ),
21-
user = require( 'lib/user' )();
21+
user = require( 'lib/user' )(),
22+
userUtilities = require( 'lib/user/utils' );
2223

2324
import Button from 'components/button';
2425
import purchasesPaths from 'me/purchases/paths';
@@ -49,9 +50,13 @@ const MeSidebar = React.createClass( {
4950
redirect = '/?apppromo';
5051
}
5152

52-
this.props.logoutUser( redirect ).then( ( { redirect_to } ) => {
53-
user.clear( () => location.href = redirect_to || '/' );
54-
} );
53+
if ( config.isEnabled( 'login/wp-login' ) ) {
54+
this.props.logoutUser( redirect ).then( ( { redirect_to } ) => {
55+
user.clear( () => location.href = redirect_to || '/' );
56+
} );
57+
} else {
58+
userUtilities.logout( redirect );
59+
}
5560

5661
this.recordClickEvent( 'Sidebar Sign Out Link' );
5762
},

0 commit comments

Comments
 (0)