summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2014-12-18 23:18:37 +0100
committerJörn Friedrich Dreyer <jfd@butonic.de>2014-12-18 23:18:37 +0100
commit891474b0d6b8cc77a8480cd91f1e48ad3bc3e73b (patch)
treededc4a94ec16651266bf15d46a6687efb901c63e /lib/base.php
parent49318b4d93b4dc5fbd58fa87b2efa8f1577fb7b7 (diff)
parent51a22431ee824357dce0100cb000032f29aabd47 (diff)
downloadnextcloud-server-891474b0d6b8cc77a8480cd91f1e48ad3bc3e73b.tar.gz
nextcloud-server-891474b0d6b8cc77a8480cd91f1e48ad3bc3e73b.zip
Merge pull request #12759 from owncloud/core-reduce-js-and-css
make sure styles and scripts are only loaded once
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php
index ae87ecff394..009732ead7b 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -336,7 +336,6 @@ class OC {
public static function initTemplateEngine() {
// Add the stuff we need always
-
// following logic will import all vendor libraries that are
// specified in core/js/core.json
$fileContent = file_get_contents(OC::$SERVERROOT . '/core/js/core.json');
@@ -351,7 +350,6 @@ class OC {
throw new \Exception('Cannot read core/js/core.json');
}
- OC_Util::addScript("jquery-showpassword");
OC_Util::addScript("placeholders");
OC_Util::addScript("jquery-tipsy");
OC_Util::addScript("compatibility");