diff options
author | Arthur Schiwon <blizzz@owncloud.com> | 2015-08-06 12:08:42 +0200 |
---|---|---|
committer | Arthur Schiwon <blizzz@owncloud.com> | 2015-08-06 12:08:42 +0200 |
commit | 67bb5712e4f1264003cd944e186d13a3c83908b8 (patch) | |
tree | 0b7e6443777bdd0ebbf3641a1c598a87bfc3ae3f /lib | |
parent | cc4a2a472735313c5eae1a9c7d4ff4a177b80c44 (diff) | |
download | nextcloud-server-67bb5712e4f1264003cd944e186d13a3c83908b8.tar.gz nextcloud-server-67bb5712e4f1264003cd944e186d13a3c83908b8.zip |
make available as OC.Backbone to avoid conflicts
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/util.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index 1b22e03ca6f..fd11080a592 100644 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -455,6 +455,11 @@ class OC_Util { $path = OC_Util::generatePath($application, 'vendor', $file); if (!in_array($path, self::$scripts)) { self::$scripts[] = $path; + if($file === 'backbone/backbone') { + // makes backbone available as OC.Backbone in order to avoid + // conflicts, because apps (like Mail) may bring own versions + OC_Util::addScript('oc-backbone'); + } } } |