diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-04 11:54:52 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-04 11:54:52 -0400 |
commit | c7bdce8a6641ed8d361a43b6004a351535c78423 (patch) | |
tree | f42d32d8a4d0cd4f702644dcb6a594f905f3f771 /webapp/stores | |
parent | 3a79e451ffe3ffe618311ee15b02dbebde6a77b0 (diff) | |
download | chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.gz chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.bz2 chat-c7bdce8a6641ed8d361a43b6004a351535c78423.zip |
PLT-5900 Removed automatic configuration of SiteURL (#5952)
* Revert "PLT-5765 Passed SiteURL to SendNotifications (#5705)"
This reverts commit a8e68bd8905972ae59de90fa33d5b3e3c274dc47.
* Removed automatic configuration of SiteURL
* Reverted unintentional config changes
* Updated help text
* Added link to docs in Site URL warning
* Fixed merge conflict
Diffstat (limited to 'webapp/stores')
-rw-r--r-- | webapp/stores/error_store.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/stores/error_store.jsx b/webapp/stores/error_store.jsx index e37de40ac..3b0bb023f 100644 --- a/webapp/stores/error_store.jsx +++ b/webapp/stores/error_store.jsx @@ -62,11 +62,11 @@ class ErrorStoreClass extends EventEmitter { BrowserStore.setGlobalItem('last_error_conn', count); } - clearLastError() { + clearLastError(force) { var lastError = this.getLastError(); // preview message can only be cleared by clearNotificationError - if (lastError && lastError.notification) { + if (!force && lastError && lastError.notification) { return; } |