diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 16:20:13 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-09-07 16:20:13 +0200 |
| commit | 631df21de640183623e626409903a0a1f7b0105d (patch) | |
| tree | 8010e73de4e0002a80a86241a1eff7f7f3081adf /lib/app.php | |
| parent | 3829460ab8cbb6de65c53583a20fd04cbe7927dd (diff) | |
| download | nextcloud-server-631df21de640183623e626409903a0a1f7b0105d.tar.gz nextcloud-server-631df21de640183623e626409903a0a1f7b0105d.zip | |
Prevent loading all apps twice from overwriting the core scripts and styles
Diffstat (limited to 'lib/app.php')
| -rwxr-xr-x | lib/app.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/app.php b/lib/app.php index f5c328afe7c..f1e4f965efd 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; |