From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 11 May 2012 22:31:42 +0000 (+0200)
Subject: Better place to check caching headers
X-Git-Tag: v4.0.0RC2~38
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5d72681d10527c7719d8d296657dc3127b7f379d;p=nextcloud-server.git

Better place to check caching headers
---

diff --git a/lib/base.php b/lib/base.php
index ddf410c3163..52a497e076d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -289,12 +289,12 @@ class OC{
 				$appswebroot = (string) OC::$APPSWEBROOT;
 				$webroot = (string) OC::$WEBROOT;
 				$filepath = OC::$APPSROOT . '/apps/' . OC::$REQUESTEDAPP . '/' . OC::$REQUESTEDFILE;
-				$cssfile = file_get_contents($filepath);
-				$cssfile = str_replace('%appswebroot%', $appswebroot, $cssfile);
-				$cssfile = str_replace('%webroot%', $webroot, $cssfile);
 				header('Content-Type: text/css');
 				OC_Response::enableCaching();
 				OC_Response::setLastModifiedHeader(filemtime($filepath));
+				$cssfile = file_get_contents($filepath);
+				$cssfile = str_replace('%appswebroot%', $appswebroot, $cssfile);
+				$cssfile = str_replace('%webroot%', $webroot, $cssfile);
 				OC_Response::setETagHeader(md5($cssfile));
 				header('Content-Length: '.strlen($cssfile));
 				echo $cssfile;