diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-06-05 17:45:09 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-06-05 17:51:52 +0200 |
| commit | 57326ea1f87f9f2d2884fc87c556fec3c6bc378e (patch) | |
| tree | 730346abcac03b19d7bc0b732455dd3503863d1b /lib | |
| parent | 0d1a07d4ae5f3023ff2a8c3c530a28ac97d7797f (diff) | |
| download | nextcloud-server-57326ea1f87f9f2d2884fc87c556fec3c6bc378e.tar.gz nextcloud-server-57326ea1f87f9f2d2884fc87c556fec3c6bc378e.zip | |
Move setting remote_core.* to after setup of OC, also check if it is not set yet
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/base.php b/lib/base.php index 641005c57c6..a439651f4a6 100644 --- 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){ |