summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-09-28 21:41:21 +0200
committerBart Visscher <bartv@thisnet.nl>2012-09-28 21:41:21 +0200
commitc9317b5a68baac268e8b24a462065a5e9e3164e7 (patch)
treed695547b8901cc2070368982a12a0e6579cf255c /lib/base.php
parentbf1057143cdff8ec289d9d766ab100d64d7ea45d (diff)
parentfed34aecfa5b36c031ed754ed245549aa4a4194b (diff)
downloadnextcloud-server-c9317b5a68baac268e8b24a462065a5e9e3164e7.tar.gz
nextcloud-server-c9317b5a68baac268e8b24a462065a5e9e3164e7.zip
Merge branch 'master' into routing
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php
index fa777cb9343..2d82d5a40fc 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -247,6 +247,8 @@ class OC{
OC_Util::addScript( "jquery-tipsy" );
OC_Util::addScript( "oc-dialogs" );
OC_Util::addScript( "js" );
+ // request protection token MUST be defined after the jquery library but before any $('document').ready()
+ OC_Util::addScript( "requesttoken" );
OC_Util::addScript( "eventsource" );
OC_Util::addScript( "config" );
//OC_Util::addScript( "multiselect" );