kill $coreStyles and $coreScripts

remotes/origin/ldap_group_count
Thomas Müller 11 years ago
parent 01929096fe
commit fbea02bebb
  1. 4
      lib/base.php
  2. 11
      lib/private/app.php
  3. 2
      lib/private/util.php

@ -284,10 +284,6 @@ class OC {
if (self::needUpgrade()) {
if ($showTemplate && !OC_Config::getValue('maintenance', false)) {
OC_Config::setValue('theme', '');
// $minimizerCSS = new OC_Minimizer_CSS();
// $minimizerCSS->clearCache();
// $minimizerJS = new OC_Minimizer_JS();
// $minimizerJS->clearCache();
OC_Util::addScript('config'); // needed for web root
OC_Util::addScript('update');
$tmpl = new OC_Template('', 'update.admin', 'guest');

@ -69,17 +69,6 @@ class OC_App{
}
ob_end_clean();
if (!defined('DEBUG') || !DEBUG) {
if (is_null($types)
&& empty(OC_Util::$coreScripts)
&& empty(OC_Util::$coreStyles)) {
OC_Util::$coreScripts = OC_Util::$scripts;
OC_Util::$scripts = array();
OC_Util::$coreStyles = OC_Util::$styles;
OC_Util::$styles = array();
}
}
// return
return true;
}

@ -11,8 +11,6 @@ class OC_Util {
public static $headers=array();
private static $rootMounted=false;
private static $fsSetup=false;
public static $coreStyles=array();
public static $coreScripts=array();
/**
* @brief Can be set up

Loading…
Cancel
Save