Merge pull request #1909 from dotCMS/issue-1862-error-500-when-you-de…

…lete-the-CMS-anonymous fixes #1862
dotCMS · Jan 23, 2013 · a2b140e · a2b140e
2 parents 45a9a24 + 1343484
commit a2b140e
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/com/dotmarketing/velocity/VelocityServlet.java b/src/com/dotmarketing/velocity/VelocityServlet.java
@@ -534,10 +534,9 @@ public void doPreviewMode(HttpServletRequest request, HttpServletResponse respon
 
 		// Getting the user to check the permissions
 		com.liferay.portal.model.User user = null;
-		HttpSession session = request.getSession(false);
-		try {
-			if(session!=null)
-				user = (com.liferay.portal.model.User) session.getAttribute(com.dotmarketing.util.WebKeys.CMS_USER);
+
+		try {			
+				user = com.liferay.portal.util.PortalUtil.getUser( request );
 		} catch (Exception nsue) {
 			Logger.warn(this, "Exception trying getUser: " + nsue.getMessage(), nsue);
 		}
@@ -797,10 +796,10 @@ protected void doEditMode ( HttpServletRequest request, HttpServletResponse resp
 
         com.dotmarketing.portlets.templates.model.Template cmsTemplate = com.dotmarketing.portlets.htmlpages.factories.HTMLPageFactory.getHTMLPageTemplate( htmlPage, true );
         //issue- 1775 If User doesn't have edit permission on HTML Pages
-        if(!hasWritePermOverHTMLPage){
+       /* if(!hasWritePermOverHTMLPage){
         	doPreviewMode(request, response);
         	return;
-        }
+        }*/
         if ( cmsTemplate == null ) {// DOTCMS-4051
             cmsTemplate = new com.dotmarketing.portlets.templates.model.Template();
             Logger.debug( VelocityServlet.class, "HTMLPAGE TEMPLATE NOT FOUND" );