Prevent loading all apps twice from overwriting the core scripts and styles

diff --git a/lib/app.php b/lib/app.php
index f5c328afe7c8e1e63dee40a4bf0e868e3ee5a851..f1e4f965efd5233430c4e73e7c05f893b550c71c 100755 (executable)
--- 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;