Fix mail usage patch, comment out patch on provisioning api (44abacd8) · Commits · e / infra / ecloud / nextcloud

Dockerfile

+1 −1

Original line number	Diff line number	Diff line
		@@ -232,7 +232,7 @@ RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i $
		RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/025-optimize-get-by-email.patch
		RUN patch -u ${BASE_DIR}/apps/dav/lib/Connector/Sabre/Principal.php -i ${TMP_PATCH_DIR}/027-displayname-user-leak-dav.patch
		RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-default-task-calendar.patch
		RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.php -i ${TMP_PATCH_DIR}/029-restrict-user-to-change-primary-email.patch
		# RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.php -i ${TMP_PATCH_DIR}/029-restrict-user-to-change-primary-email.patch
		RUN patch -u ${BASE_DIR}/lib/private/Security/VerificationToken/VerificationToken.php -i ${TMP_PATCH_DIR}/033-verification-token-private.patch
		RUN patch -u ${BASE_DIR}/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php -i ${TMP_PATCH_DIR}/034-oidc-bearer-token-auth.patch

+8 −10

Original line number	Diff line number	Diff line
		--- lib/private/legacy/OC_Helper.php 2022-11-23 19:35:50.880495300 +0530
		+++ lib/private/legacy/OC_Helper-new.php 2022-11-23 19:40:09.970495300 +0530
		--- lib/private/legacy/OC_Helper.php 2025-05-25 16:00:00.880495300 +0530
		+++ lib/private/legacy/OC_Helper-new.php 2025-05-25 16:02:00.970495300 +0530
		@@ -542,6 +542,12 @@
		}
		try {
		@@ -13,12 +13,10 @@
		if (is_bool($free)) {
		$free = 0.0;
		}
		@@ -571,8 +577,6 @@
		$relative = 0;
		}
		@@ -577,7 +583,6 @@
		*/
		$isRemoteShare = $storage->instanceOfStorage(\OCA\Files_Sharing\External\Storage::class);

		- /** @var string $ownerId */
		- $ownerId = $storage->getOwner($path);
		$hasOwnerId = $ownerId !== false && $ownerId !== null;
		$ownerDisplayName = '';
		if ($ownerId) {
		$ownerDisplayName = \OC::$server->getUserManager()->getDisplayName($ownerId) ?? '';
		No newline at end of file