When debug don't load the bundled file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php
index 6f234a08e3074d719ca05ea0a236dd112d26a392..3f6bfe586db96be3a51608926f808635fce7fda3 100644 (file)
--- a/lib/private/legacy/template.php
+++ b/lib/private/legacy/template.php
@@ -137,8 +137,25 @@ class OC_Template extends \OC\Template\Base {
                        OC_Util::addScript('files/fileinfo');
                        OC_Util::addScript('files/client');
 
-                       // Import all (combined) default vendor libraries
-                       OC_Util::addVendorScript('core', null, true);
+                       if (\OC::$server->getConfig()->getSystemValue('debug')) {
+                               // 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');
+                               if($fileContent !== false) {
+                                       $coreDependencies = json_decode($fileContent, true);
+                                       foreach(array_reverse($coreDependencies['vendor']) as $vendorLibrary) {
+                                               //remove trailing ".js" as addVendorScript will append it
+                                               OC_Util::addVendorScript(
+                                                       substr($vendorLibrary, 0, strlen($vendorLibrary) - 3),null,true);
+                                               }
+                               } else {
+                                       throw new \Exception('Cannot read core/js/core.json');
+                               }
+                       } else {
+                               // Import all (combined) default vendor libraries
+                               OC_Util::addVendorScript('core', null, true);
+                       }
 
                        if (\OC::$server->getRequest()->isUserAgent([\OC\AppFramework\Http\Request::USER_AGENT_IE])) {
                                // polyfill for btoa/atob for IE friends