From e5b64d25e4c9b15d7d07f167532b174b7728abe3 Mon Sep 17 00:00:00 2001
From: Jarda Snajdr <jsnajdr@gmail.com>
Date: Fri, 2 Nov 2018 14:59:57 +0100
Subject: [PATCH] Render empty layout for logged out home page

Makes e2e tests happy, should eventually be replaced with some more systematic approach
to how to handle logged-out pages and redirects to login page.
---
 client/boot/common.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/client/boot/common.js b/client/boot/common.js
index cf1989e60c1d7..f173626923600 100644
--- a/client/boot/common.js
+++ b/client/boot/common.js
@@ -26,6 +26,7 @@ import { getSections } from 'sections-helper';
 import { checkFormHandler } from 'lib/protect-form';
 import notices from 'notices';
 import authController from 'auth/controller';
+import { makeLayout, render as clientRender } from 'controller';
 
 const debug = debugFactory( 'calypso' );
 
@@ -102,9 +103,10 @@ const loggedOutMiddleware = currentUser => {
 			}
 		} );
 	} else if ( config.isEnabled( 'devdocs/redirect-loggedout-homepage' ) ) {
-		page( '/', () => {
-			page.redirect( '/devdocs/start' );
-		} );
+		page( '/', '/devdocs/start' );
+	} else {
+		// render an empty layout with masterbar links for logged-out home page
+		page( '/', makeLayout, clientRender );
 	}
 
 	const validSections = getSections().reduce( ( acc, section ) => {