A quiet little CSS override update.

git-svn-id: https://code.elgg.org/elgg/trunk@3030 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 6 insertions, 3 deletions

diff --git a/_css/css.php b/_css/css.php
index 7030bf174..7d0821376 100644
--- a/_css/css.php
+++ b/_css/css.php
@@ -28,10 +28,12 @@
 

 		define('externalpage',true);

 

-		global $viewinput;

+		global $viewinput, $override;

 		$viewinput['view'] = 'css';

 		$viewinput['viewtype'] = $_GET['viewtype'];

 

+		$override = true;

+		

 		header("Content-type: text/css", true);

 		header('Expires: ' . date('r',time() + 864000), true);

 		header("Pragma: public", true);

diff --git a/simplecache/view.php b/simplecache/view.php
index 47bf9e8e4..626ac8bac 100644
--- a/simplecache/view.php
+++ b/simplecache/view.php
@@ -15,7 +15,8 @@
 	// Get DB settings, connect

 		require_once(dirname(dirname(__FILE__)). '/engine/settings.php');

 		

-		global $CONFIG, $viewinput;

+		global $CONFIG, $viewinput, $override;

+		if (!isset($override)) $override = true;

 		

 		$contents = '';

 		if (!isset($viewinput)) $viewinput = $_GET;

@@ -44,7 +45,7 @@
 					}

 				}

 				

-				if ($simplecache_enabled) {

+				if ($simplecache_enabled || $override) {

 					$filename = $dataroot . 'views_simplecache/' . md5($viewtype . $view);

 					if (file_exists($filename))

 						$contents = @file_get_contents($filename);