From 4260dce826cc0572371d5ab0d30ecf5f1ecb072a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 7 Jun 2012 17:28:39 +0200
Subject: Better handling of core.css and core.js

Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
---
 lib/app.php  | 5 +++++
 lib/base.php | 7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/app.php b/lib/app.php
index 667633e2647..e8a5a1291d9 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -67,6 +67,11 @@ class OC_App{
 				OC_Util::$scripts = array();
 				OC_Util::$core_styles = OC_Util::$styles;
 				OC_Util::$styles = array();
+
+				if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) {
+					OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
+					OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
+				}
 			}
 		}
 		// return
diff --git a/lib/base.php b/lib/base.php
index a65a33b166e..4bd165862bb 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -426,13 +426,6 @@ class OC{
 		//make sure temporary files are cleaned up
 		register_shutdown_function(array('OC_Helper','cleanTmp'));
 
-		if (OC_Config::getValue('installed', false)) {
-			if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) {
-				OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
-				OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
-			}
-		}
-
 		//parse the given parameters
 		self::$REQUESTEDAPP = (isset($_GET['app'])?str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files'));
 		if(substr_count(self::$REQUESTEDAPP, '?') != 0){
-- 
cgit v1.2.3