diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-01-26 15:18:23 -0800 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-01-26 15:18:23 -0800 |
| commit | 9e498b6548f323eda19e8ab2ba83aeea8697abc8 (patch) | |
| tree | 53d8521f5d1513f2bd0920e7c406da22337863ef | |
| parent | 00a28062e12761c6b806497a6e4a811a8f363ce1 (diff) | |
| parent | 0986b6f9108049e6443a6fe9af49e1c83d21fd31 (diff) | |
| download | nextcloud-server-9e498b6548f323eda19e8ab2ba83aeea8697abc8.tar.gz nextcloud-server-9e498b6548f323eda19e8ab2ba83aeea8697abc8.zip | |
Merge pull request #1326 from owncloud/event-source-token
Use global oc_requesttoken for Event Source
| -rw-r--r-- | core/js/eventsource.js | 2 | ||||
| -rw-r--r-- | core/templates/update.php | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 0c2a995f331..f783ade7ae9 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -40,7 +40,7 @@ OC.EventSource=function(src,data){ dataStr+=name+'='+encodeURIComponent(data[name])+'&'; } } - dataStr+='requesttoken='+OC.EventSource.requesttoken; + dataStr+='requesttoken='+oc_requesttoken; if(!this.useFallBack && typeof EventSource !='undefined'){ var joinChar = '&'; if(src.indexOf('?') == -1) { diff --git a/core/templates/update.php b/core/templates/update.php index c9f3144f257..c65230db0d6 100644 --- a/core/templates/update.php +++ b/core/templates/update.php @@ -5,7 +5,6 @@ </ul> <script> $(document).ready(function () { - OC.EventSource.requesttoken = oc_requesttoken; var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php'); updateEventSource.listen('success', function(message) { $('<span>').append(message).append('<br />').appendTo($('.update')); |