summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-06-07 17:28:39 +0200
committerBart Visscher <bartv@thisnet.nl>2012-06-07 21:35:40 +0200
commit4260dce826cc0572371d5ab0d30ecf5f1ecb072a (patch)
tree12eef3538637e35fcb8995a8be45327120962a73 /lib
parentd4f6f3e9355979aedb174d6f9b5f60380934aca9 (diff)
downloadnextcloud-server-4260dce826cc0572371d5ab0d30ecf5f1ecb072a.tar.gz
nextcloud-server-4260dce826cc0572371d5ab0d30ecf5f1ecb072a.zip
Better handling of core.css and core.js
Fixes calling remote.php on install. Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933
Diffstat (limited to 'lib')
-rwxr-xr-xlib/app.php5
-rw-r--r--lib/base.php7
2 files changed, 5 insertions, 7 deletions
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){