From 631df21de640183623e626409903a0a1f7b0105d Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 7 Sep 2012 16:20:13 +0200
Subject: [PATCH] Prevent loading all apps twice from overwriting the core
scripts and styles
---
lib/app.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/app.php b/lib/app.php
index f5c328afe7..f1e4f965ef 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -62,7 +62,9 @@ class OC_App{
ob_end_clean();
if (!defined('DEBUG') || !DEBUG) {
- if (is_null($types)) {
+ if (is_null($types)
+ && empty(OC_Util::$core_scripts)
+ && empty(OC_Util::$core_styles)) {
OC_Util::$core_scripts = OC_Util::$scripts;
OC_Util::$scripts = array();
OC_Util::$core_styles = OC_Util::$styles;
--
GitLab