#28366 include in 23.10.24 LTS

dotCMS · Aug 14, 2024 · b1f7d23 · b1f7d23
1 parent 8aebc4e
commit b1f7d23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md
@@ -137,4 +137,5 @@ This maintenance release includes the following code fixes:
 130. https://github.com/dotCMS/core/issues/26413 : Template Builder: Container Layout Editing Issue #26413
 131. https://github.com/dotCMS/core/issues/27816 : Content Displacement Bug when Editing Template #27816
 132. https://github.com/dotCMS/core/issues/28163 : 'alive' and 'startup' healthcheck APIs return 503 on seemingly healthy app #28163
-133. https://github.com/dotCMS/core/issues/26546 : Enable better logging for getPageByPath in HTMLPageAssetAPIImpl.java #26546
+133. https://github.com/dotCMS/core/issues/26546 : Enable better logging for getPageByPath in HTMLPageAssetAPIImpl.java #26546
+134. https://github.com/dotCMS/core/issues/28366 : Uploaded images in another language than the default one do not inherit permissions #28366
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_permissions_tab_inc_wrapper.jsp b/dotCMS/src/main/webapp/html/portlet/ext/contentlet/edit_permissions_tab_inc_wrapper.jsp
@@ -13,6 +13,7 @@ This jsp gets called in the edit content screen (edit_content_js_inc.jsp) to pai
 	<% Contentlet contentlet = APILocator.getContentletAPI().findContentletByIdentifier(id, false, lang, user, false);%>
 	<%if(contentlet !=null && UtilMethods.isSet(contentlet.getIdentifier())){ %>
 		<% request.setAttribute(com.dotmarketing.util.WebKeys.PERMISSIONABLE_EDIT, contentlet);%>
+		<% request.setAttribute(com.dotmarketing.util.WebKeys.CONTENTLET_EDIT, contentlet);%>
 		<% APILocator.getPermissionAPI().checkPermission(contentlet, PermissionLevel.EDIT_PERMISSIONS, user);%>
 
 		<%@ include file="/html/portlet/ext/common/edit_permissions_tab_inc.jsp" %>