Merge pull request #58339 from nextcloud/backport/58203/stable31

[stable31] fix: obey x-nc-scheduling flag on delete
2026-03-02 21:41:12 -05:00 · 2026-02-18 11:39:16 -05:00 · 2026-02-18 11:39:16 -05:00 · d1e2dd3440
commit d1e2dd3440
parent 32672d1965 32bcc99d8b
1 changed files with 8 additions and 0 deletions
--- a/apps/dav/lib/CalDAV/Schedule/Plugin.php
+++ b/apps/dav/lib/CalDAV/Schedule/Plugin.php
@ -165,6 +165,7 @@ class Plugin extends \Sabre\CalDAV\Schedule\Plugin {

 			// Do not generate iTip and iMip messages if scheduling is disabled for this message
 			if ($request->getHeader('x-nc-scheduling') === 'false') {
+				$this->logger->debug('Skipping scheduling messages for calendar object change because x-nc-scheduling header is set to false');
 				return;
 			}

@ -212,6 +213,13 @@ class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
 	 * @inheritDoc
 	 */
 	public function beforeUnbind($path): void {
+
+		// Do not generate iTip and iMip messages if scheduling is disabled for this message
+		if ($this->server->httpRequest->getHeader('x-nc-scheduling') === 'false') {
+			$this->logger->debug('Skipping scheduling messages for calendar object delete because x-nc-scheduling header is set to false');
+			return;
+		}
+
 		try {
 			parent::beforeUnbind($path);
 		} catch (SameOrganizerForAllComponentsException $e) {