Index: lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsAction.java =================================================================== diff -u -re8533c322f02d4a106ab0f3d6d997fd70869569b -r813ab0cf9ff81d0832a7f7ec185ef9dc4ce1c987 --- lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsAction.java (.../FindUserLessonsAction.java) (revision e8533c322f02d4a106ab0f3d6d997fd70869569b) +++ lams_central/src/java/org/lamsfoundation/lams/web/FindUserLessonsAction.java (.../FindUserLessonsAction.java) (revision 813ab0cf9ff81d0832a7f7ec185ef9dc4ce1c987) @@ -137,7 +137,7 @@ jsonArray.put(jsonObject); } - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(jsonArray); return null; @@ -164,4 +164,4 @@ } -} \ No newline at end of file +} Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java =================================================================== diff -u -re8533c322f02d4a106ab0f3d6d997fd70869569b -r813ab0cf9ff81d0832a7f7ec185ef9dc4ce1c987 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java (.../EmailNotificationsAction.java) (revision e8533c322f02d4a106ab0f3d6d997fd70869569b) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java (.../EmailNotificationsAction.java) (revision 813ab0cf9ff81d0832a7f7ec185ef9dc4ce1c987) @@ -271,7 +271,7 @@ } } - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(JSONObject); return null; } @@ -316,7 +316,7 @@ cellarray.put(cellobj); } responcedata.put("rows", cellarray); - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(new String(responcedata.toString())); return null; } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java =================================================================== diff -u -r0aabb756f82d82d1b238b987f4a1b236b841ec61 -r813ab0cf9ff81d0832a7f7ec185ef9dc4ce1c987 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision 0aabb756f82d82d1b238b987f4a1b236b841ec61) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision 813ab0cf9ff81d0832a7f7ec185ef9dc4ce1c987) @@ -906,7 +906,7 @@ JSONObject JSONObject = new JSONObject(); JSONObject.put("averageRating", averageRatingDTO.getRating()); JSONObject.put("numberOfVotes", averageRatingDTO.getNumberOfVotes()); - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(JSONObject); return null; } Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java =================================================================== diff -u -r8b736700ac9b865550083def7455398e834dee7c -r813ab0cf9ff81d0832a7f7ec185ef9dc4ce1c987 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java (.../LearningAction.java) (revision 8b736700ac9b865550083def7455398e834dee7c) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java (.../LearningAction.java) (revision 813ab0cf9ff81d0832a7f7ec185ef9dc4ce1c987) @@ -314,7 +314,7 @@ JSONObject JSONObject = new JSONObject(); JSONObject.put(KalturaConstants.PARAM_ITEM_UID, item.getUid()); - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(JSONObject); return null; } @@ -401,7 +401,7 @@ JSONObject JSONObject = new JSONObject(); JSONObject.put("averageRating", averageRatingDto.getRating()); JSONObject.put("numberOfVotes", averageRatingDto.getNumberOfVotes()); - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(JSONObject); return null; } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== diff -u -r0aabb756f82d82d1b238b987f4a1b236b841ec61 -r813ab0cf9ff81d0832a7f7ec185ef9dc4ce1c987 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 0aabb756f82d82d1b238b987f4a1b236b841ec61) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 813ab0cf9ff81d0832a7f7ec185ef9dc4ce1c987) @@ -730,7 +730,7 @@ JSONObject JSONObject = new JSONObject(); JSONObject.put("averageRating", averageRatingDTO.getRating()); JSONObject.put("numberOfVotes", averageRatingDTO.getNumberOfVotes()); - response.setContentType("application/x-json;charset=utf-8"); + response.setContentType("application/json;charset=utf-8"); response.getWriter().print(JSONObject); return null; } @@ -983,4 +983,4 @@ return qaService.getUserByIdAndSession(userId, new Long(toolSessionID)); } -} \ No newline at end of file +}