LPS-135470 SF

Author: Stian Sigvartsen

portal-impl/src/com/liferay/portal/events/ServicePreAction.java

@@ -887,10 +887,6 @@ private ThemeDisplay _initThemeDisplay(
 			return null;
 		}
 
-		// Portal URL
-
-		String portalURL = PortalUtil.getPortalURL(httpServletRequest);
-
 		boolean signedIn = !user.isDefaultUser();
 
 		if (PropsValues.BROWSER_CACHE_DISABLED ||
@@ -916,15 +912,6 @@ private ThemeDisplay _initThemeDisplay(
 			realUser = UserLocalServiceUtil.getUserById(realUserId.longValue());
 		}
 
-		String doAsUserId = ParamUtil.getString(
-			httpServletRequest, "doAsUserId");
-		String doAsUserLanguageId = ParamUtil.getString(
-			httpServletRequest, "doAsUserLanguageId");
-		long doAsGroupId = ParamUtil.getLong(httpServletRequest, "doAsGroupId");
-
-		long refererGroupId = ParamUtil.getLong(
-			httpServletRequest, "refererGroupId");
-
 		long refererPlid = ParamUtil.getLong(httpServletRequest, "refererPlid");
 
 		if ((refererPlid != 0) &&
@@ -978,7 +965,6 @@ private ThemeDisplay _initThemeDisplay(
 		}
 
 		Layout layout = null;
-		List<Layout> layouts = null;
 
 		long plid = ParamUtil.getLong(httpServletRequest, "p_l_id");
 
@@ -1057,6 +1043,21 @@ private ThemeDisplay _initThemeDisplay(
 			}
 		}
 
+		// Portal URL
+
+		String portalURL = PortalUtil.getPortalURL(httpServletRequest);
+
+		String doAsUserId = ParamUtil.getString(
+			httpServletRequest, "doAsUserId");
+		String doAsUserLanguageId = ParamUtil.getString(
+			httpServletRequest, "doAsUserLanguageId");
+		long doAsGroupId = ParamUtil.getLong(httpServletRequest, "doAsGroupId");
+
+		long refererGroupId = ParamUtil.getLong(
+			httpServletRequest, "refererGroupId");
+
+		List<Layout> layouts = null;
+
 		String ppid = ParamUtil.getString(httpServletRequest, "p_p_id");
 
 		Boolean redirectToDefaultLayout =