diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-06-29 18:36:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-29 18:36:51 +0200 |
| commit | d1b0ccb715305b08b7f426a287b9929a50c65e49 (patch) | |
| tree | 0ef8a63ee8a618428bdf94b4ca074a99c4bf3194 /apps | |
| parent | fbc937758e1dd07c5be2780308856298920074b8 (diff) | |
| parent | 14c33bb2e9fc32594fdbcffa1edde1f1e15665cc (diff) | |
| download | nextcloud-server-d1b0ccb715305b08b7f426a287b9929a50c65e49.tar.gz nextcloud-server-d1b0ccb715305b08b7f426a287b9929a50c65e49.zip | |
Merge pull request #27488 from msrn/win10cal-useragent
Add regex to match Windows 10 calendar user-agent
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/CalDAV/WebcalCaching/Plugin.php | 5 | ||||
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/WebcalCaching/PluginTest.php | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php b/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php index 13aef7ed227..3dd8a7c81e5 100644 --- a/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php +++ b/apps/dav/lib/CalDAV/WebcalCaching/Plugin.php @@ -40,9 +40,12 @@ class Plugin extends ServerPlugin { * list of regular expressions for calendar user agents, * that do not support subscriptions on their own * + * /^MSFT-WIN-3/ - Windows 10 Calendar * @var string[] */ - public const ENABLE_FOR_CLIENTS = []; + public const ENABLE_FOR_CLIENTS = [ + "/^MSFT-WIN-3/" + ]; /** * @var bool diff --git a/apps/dav/tests/unit/CalDAV/WebcalCaching/PluginTest.php b/apps/dav/tests/unit/CalDAV/WebcalCaching/PluginTest.php index b848a5d591a..310d266cd57 100644 --- a/apps/dav/tests/unit/CalDAV/WebcalCaching/PluginTest.php +++ b/apps/dav/tests/unit/CalDAV/WebcalCaching/PluginTest.php @@ -31,7 +31,7 @@ class PluginTest extends \Test\TestCase { $request = $this->createMock(IRequest::class); $request->expects($this->at(0)) ->method('isUserAgent') - ->with([]) + ->with(Plugin::ENABLE_FOR_CLIENTS) ->willReturn(false); $request->expects($this->at(1)) @@ -48,7 +48,7 @@ class PluginTest extends \Test\TestCase { $request = $this->createMock(IRequest::class); $request->expects($this->at(0)) ->method('isUserAgent') - ->with([]) + ->with(Plugin::ENABLE_FOR_CLIENTS) ->willReturn(false); $request->expects($this->at(1)) |