diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-11-18 13:39:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-18 13:39:47 +0100 |
| commit | c241539a21a38d5710c160ae02794ffb26008853 (patch) | |
| tree | 24cfa54e9a3bd9924b36d890b567cffa22654186 /settings/js | |
| parent | 310d60b5859804aaef87d2a490b9007b7d8399b0 (diff) | |
| parent | 9a613078f6cdf21b8976a3a4cfc73b109897fbda (diff) | |
| download | nextcloud-server-c241539a21a38d5710c160ae02794ffb26008853.tar.gz nextcloud-server-c241539a21a38d5710c160ae02794ffb26008853.zip | |
Merge pull request #2108 from nextcloud/properly-parse-ie-useragent
Properly parse IE 11 user agent
Diffstat (limited to 'settings/js')
| -rw-r--r-- | settings/js/authtoken_view.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js index 0939913cc1a..d8537c415ce 100644 --- a/settings/js/authtoken_view.js +++ b/settings/js/authtoken_view.js @@ -118,7 +118,7 @@ var matches = viewData.name.match(/Mozilla\/5\.0 \((\w+)\) (?:mirall|csyncoC)\/(\d+\.\d+\.\d+)/); var userAgentMap = { - ie: /(?:MSIE|Trident) (\d+)/, + ie: /(?:MSIE|Trident|Trident\/7.0; rv)[ :](\d+)/, // Microsoft Edge User Agent from https://msdn.microsoft.com/en-us/library/hh869301(v=vs.85).aspx edge: /^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Chrome\/[0-9.]+ (?:Mobile Safari|Safari)\/[0-9.]+ Edge\/[0-9.]+$/, // Firefox User Agent from https://developer.mozilla.org/en-US/docs/Web/HTTP/Gecko_user_agent_string_reference |