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

This commit is contained in:
Bart Visscher 2012-09-07 16:20:13 +02:00
parent 3829460ab8
commit 631df21de6

View file

@ -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;