diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2014-02-21 20:37:10 +0100 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2014-02-21 20:37:10 +0100 |
| commit | 079d64ce750ac25a9562df75b663075304ab934a (patch) | |
| tree | 9f206984ce4a3f0ce05d633f306b7f724bd4f030 /lib/base.php | |
| parent | a2000a15f87a4c8d38671565e29e42f666e7cb8c (diff) | |
| parent | e549977d0e2fd7afae5adb253038494247a27322 (diff) | |
| download | nextcloud-server-079d64ce750ac25a9562df75b663075304ab934a.tar.gz nextcloud-server-079d64ce750ac25a9562df75b663075304ab934a.zip | |
Merge pull request #7310 from owncloud/no-css-js-delivery-via-php
No css js delivery via php
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/lib/base.php b/lib/base.php index 84177c7ba6c..525d290931f 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'); @@ -725,11 +721,6 @@ class OC { $app = OC::$REQUESTEDAPP; $file = OC::$REQUESTEDFILE; $param = array('app' => $app, 'file' => $file); - // Handle app css files - if (substr($file, -3) == 'css') { - self::loadCSSFile($param); - return; - } // Handle redirect URL for logged in users if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) { @@ -796,19 +787,6 @@ class OC { return false; } - public static function loadCSSFile($param) { - $app = $param['app']; - $file = $param['file']; - $app_path = OC_App::getAppPath($app); - if (file_exists($app_path . '/' . $file)) { - $app_web_path = OC_App::getAppWebPath($app); - $filepath = $app_web_path . '/' . $file; - $minimizer = new OC_Minimizer_CSS(); - $info = array($app_path, $app_web_path, $file); - $minimizer->output(array($info), $filepath); - } - } - protected static function handleLogin() { OC_App::loadApps(array('prelogin')); $error = array(); |