Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java =================================================================== diff -u -r6a414b5f0f7756f0376670914c59c84b9ae916ef -re7451ceb951ebe7eb0a84fdb0d51487579c6504f --- lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java (.../ProfileAction.java) (revision 6a414b5f0f7756f0376670914c59c84b9ae916ef) +++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java (.../ProfileAction.java) (revision e7451ceb951ebe7eb0a84fdb0d51487579c6504f) @@ -71,8 +71,7 @@ */ /** - * @struts:action path="/profile" name="UserForm" scope="request" - * parameter="method" validate="false" + * @struts:action path="/profile" name="UserForm" scope="request" parameter="method" validate="false" * * @struts:action-forward name="view" path=".profile" * @struts:action-forward name="lessons" path=".lessons" @@ -205,7 +204,7 @@ } saveErrors(request, errors); } - + User requestor = (User) getService().getUserByLogin(request.getRemoteUser()); DynaActionForm userForm = (DynaActionForm) form; BeanUtils.copyProperties(userForm, requestor); @@ -236,12 +235,12 @@ } } } - // if still null, use the default + // if still null, use the default if (userSelectedCSSTheme == null) { userSelectedCSSTheme = themeService.getDefaultCSSTheme().getThemeId(); } userForm.set("userCSSTheme", userSelectedCSSTheme); - + // Get all the flash themes List flashThemes = themeService.getAllFlashThemes(); request.setAttribute("flashThemes", flashThemes); @@ -256,7 +255,7 @@ } } } - // if still null, use the default + // if still null, use the default if (userSelectedFlashTheme == null) { userSelectedFlashTheme = themeService.getDefaultFlashTheme().getThemeId(); } Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java =================================================================== diff -u -r6a414b5f0f7756f0376670914c59c84b9ae916ef -re7451ceb951ebe7eb0a84fdb0d51487579c6504f --- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java (.../ProfileSaveAction.java) (revision 6a414b5f0f7756f0376670914c59c84b9ae916ef) +++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java (.../ProfileSaveAction.java) (revision e7451ceb951ebe7eb0a84fdb0d51487579c6504f) @@ -57,14 +57,10 @@ */ /** - * @struts.action path="/saveprofile" name="UserForm" input=".editprofile" - * scope="request" validate="false" + * @struts.action path="/saveprofile" name="UserForm" input=".editprofile" scope="request" validate="false" * - * @struts.action-forward name="profile" - * path="/index.do?state=active&tab=profile" - * redirect="true" - * @struts.action-forward name="editprofile" - * path="/index.do?state=active&tab=editprofile" + * @struts.action-forward name="profile" path="/index.do?state=active&tab=profile" redirect="true" + * @struts.action-forward name="editprofile" path="/index.do?state=active&tab=editprofile" */ public class ProfileSaveAction extends Action { @@ -79,13 +75,13 @@ } ActionMessages errors = new ActionMessages(); - + if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_EDIT_ENABLE)) { if (!Configuration.getAsBoolean(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)) { - return mapping.findForward("editprofile"); + return mapping.findForward("editprofile"); } } - + User requestor = (User) getService().getUserByLogin(request.getRemoteUser()); DynaActionForm userForm = (DynaActionForm) form;