diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-04 20:46:32 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-04 20:46:32 +0200 |
commit | e43e8b0db8d1c9935ac49d37255e934e310798c7 (patch) | |
tree | d228f608b83e1c04ef5b97b0fe4b0a15282343b7 /core/js/oc-requesttoken.js | |
parent | 5539b9e843dbd4125ba9bbb3de79d47ef48e059b (diff) | |
parent | 09187f3b3b30e6f810c6afff7332615ed472154e (diff) | |
download | nextcloud-server-e43e8b0db8d1c9935ac49d37255e934e310798c7.tar.gz nextcloud-server-e43e8b0db8d1c9935ac49d37255e934e310798c7.zip |
Merge branch 'master' into rename-lostpassword-controller
Conflicts:
core/lostpassword/controller.php
Diffstat (limited to 'core/js/oc-requesttoken.js')
-rw-r--r-- | core/js/oc-requesttoken.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/js/oc-requesttoken.js b/core/js/oc-requesttoken.js index 6cc6b5a855b..0d7f40c592a 100644 --- a/core/js/oc-requesttoken.js +++ b/core/js/oc-requesttoken.js @@ -1,3 +1,4 @@ -$(document).bind('ajaxSend', function(elm, xhr, s) { +$(document).on('ajaxSend',function(elm, xhr, s) { xhr.setRequestHeader('requesttoken', oc_requesttoken); }); + |