LPS-64405 simplify

liferay · Mar 31, 2016 · 5b6b3d1 · 5b6b3d1
1 parent 95c4c25
commit 5b6b3d1
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/...ort/export-import-service/src/main/java/com/liferay/exportimport/staging/StagingImpl.java b/...ort/export-import-service/src/main/java/com/liferay/exportimport/staging/StagingImpl.java
@@ -303,16 +303,14 @@ public long copyFromLive(PortletRequest portletRequest, Portlet portlet)
 		ThemeDisplay themeDisplay = (ThemeDisplay)portletRequest.getAttribute(
 			WebKeys.THEME_DISPLAY);
 
-		long scopeGroupId = PortalUtil.getScopeGroupId(portletRequest);
-
 		long plid = ParamUtil.getLong(portletRequest, "plid");
 
 		Map<String, String[]> parameterMap =
 			ExportImportConfigurationParameterMapFactory.buildParameterMap(
 				portletRequest);
 
 		return publishPortlet(
-			themeDisplay.getUserId(), scopeGroupId, plid,
+			themeDisplay.getUserId(), themeDisplay.getScopeGroupId(), plid,
 			portlet.getPortletId(), parameterMap, true);
 	}
 
@@ -1672,16 +1670,14 @@ public long publishToLive(PortletRequest portletRequest, Portlet portlet)
 		ThemeDisplay themeDisplay = (ThemeDisplay)portletRequest.getAttribute(
 			WebKeys.THEME_DISPLAY);
 
-		long scopeGroupId = PortalUtil.getScopeGroupId(portletRequest);
-
 		long plid = ParamUtil.getLong(portletRequest, "plid");
 
 		Map<String, String[]> parameterMap =
 			ExportImportConfigurationParameterMapFactory.buildParameterMap(
 				portletRequest);
 
 		return publishPortlet(
-			themeDisplay.getUserId(), scopeGroupId, plid,
+			themeDisplay.getUserId(), themeDisplay.getScopeGroupId(), plid,
 			portlet.getPortletId(), parameterMap, false);
 	}