summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2020-05-14 11:30:42 +0200
committerGitHub <noreply@github.com>2020-05-14 11:30:42 +0200
commit312c200a3869866cff53887286825431d0bc4c6d (patch)
tree3c7da1b8d0807ccf8dd5c72a5c06ebb6841cf4ea
parentfe2335984ba57f64593a950ff710f5f5c68b1760 (diff)
parent5ea4182ebebd8ad1c37f7cc48029b7a60ae67121 (diff)
Merge pull request #3544 from nextcloud/bugfix/3515/change-talk-hash-based-on-configs
Take config settings into account when promoting an update
-rw-r--r--lib/Controller/RoomController.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php
index ccf2bcc5a..6fe5b9f56 100644
--- a/lib/Controller/RoomController.php
+++ b/lib/Controller/RoomController.php
@@ -127,6 +127,12 @@ class RoomController extends AEnvironmentAwareController {
'X-Nextcloud-Talk-Hash' => sha1(
$this->config->getSystemValueString('version') . '#' .
$this->config->getAppValue('spreed', 'installed_version', '') . '#' .
+ $this->config->getAppValue('spreed', 'stun_servers', '') . '#' .
+ $this->config->getAppValue('spreed', 'turn_servers', '') . '#' .
+ $this->config->getAppValue('spreed', 'signaling_servers', '') . '#' .
+ $this->config->getAppValue('spreed', 'signaling_mode', '') . '#' .
+ $this->config->getAppValue('spreed', 'allowed_groups', '') . '#' .
+ $this->config->getAppValue('spreed', 'start_conversations', '') . '#' .
$this->config->getAppValue('theming', 'cachebuster', '1')
)];
}