summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorThomas Tanghus <thomas@tanghus.net>2013-08-28 03:59:43 -0700
committerThomas Tanghus <thomas@tanghus.net>2013-08-28 03:59:43 -0700
commit9843c8e83871475e432434d290aa6c89892f8b7b (patch)
tree07963c4a3771fd2f1d49e5084b9aad837d79591b /lib/base.php
parent3e7ddbc9d932ce6c8594f9080404f85d64492cd7 (diff)
parent776d64f804534eee724a9cd08f6c242002a75ddc (diff)
downloadnextcloud-server-9843c8e83871475e432434d290aa6c89892f8b7b.tar.gz
nextcloud-server-9843c8e83871475e432434d290aa6c89892f8b7b.zip
Merge pull request #4434 from owncloud/fix_octemplate_escaping
Fix octemplate string escaping.
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php
index 2613e88d053..89ebefb0dea 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -257,8 +257,8 @@ class OC {
OC_Util::addScript("compatibility");
OC_Util::addScript("jquery.ocdialog");
OC_Util::addScript("oc-dialogs");
- OC_Util::addScript("octemplate");
OC_Util::addScript("js");
+ OC_Util::addScript("octemplate");
OC_Util::addScript("eventsource");
OC_Util::addScript("config");
//OC_Util::addScript( "multiselect" );