Move setting remote_core.* to after setup of OC, also check if it is not set yet

diff --git a/lib/base.php b/lib/base.php
index 641005c57c6ad9b9a86f34a4a9129bbdbbc62def..a439651f4a6178c641e570123a9fa700fe5b5928 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -235,9 +235,6 @@ class OC{
                                OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
                        }
 
-                       OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
-                       OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
-
                        OC_App::updateApps();
                }
        }
@@ -428,7 +425,12 @@ class OC{
 
                //make sure temporary files are cleaned up
                register_shutdown_function(array('OC_Helper','cleanTmp'));
-               
+
+               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){