summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-02-20 14:18:01 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-02-20 14:18:01 +0100
commitfbea02bebb561f7a76a876065066c9face6e484e (patch)
treec51592fc8a02e76bbc1ac68c31cd628dfd2154ac
parent01929096fed3be1689e7b0e53ab4b6a49791901f (diff)
downloadnextcloud-server-fbea02bebb561f7a76a876065066c9face6e484e.tar.gz
nextcloud-server-fbea02bebb561f7a76a876065066c9face6e484e.zip
kill $coreStyles and $coreScripts
-rw-r--r--lib/base.php4
-rw-r--r--lib/private/app.php11
-rwxr-xr-xlib/private/util.php2
3 files changed, 0 insertions, 17 deletions
diff --git a/lib/base.php b/lib/base.php
index b39a96f331f..b3911094dbf 100644
--- a/lib/base.php
+++ b/lib/base.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');
diff --git a/lib/private/app.php b/lib/private/app.php
index 47f983cce35..048d4d4aeb1 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -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;
}
diff --git a/lib/private/util.php b/lib/private/util.php
index b7856436527..b39304c485c 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -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