Better handling of core.css and core.js

Fixes calling remote.php on install.
Fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-933

diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 7f5a4d50fc6b827d9f84019f32c7f03e545c0f71..55cc8008d9a483e805d911741955b63debb4cbb0 100644 (file)
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -4,7 +4,7 @@
                <title>ownCloud</title>
                <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
                <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
-               <?php if (!defined('DEBUG') || !DEBUG): ?>
+               <?php if (!empty(OC_Util::$core_styles)): ?>
                <link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
                <?php endif ?>
                <?php foreach($_['cssfiles'] as $cssfile): ?>
@@ -14,7 +14,7 @@
                        var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
                        var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
                </script>
-               <?php if (!defined('DEBUG') || !DEBUG): ?>
+               <?php if (!empty(OC_Util::$core_scripts)): ?>
                <script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
                <?php endif ?>
                <?php foreach($_['jsfiles'] as $jsfile): ?>

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 8f6c029007fc59b4e3b3954bfba06c13e6667faa..e04fcabf137ee0ddfd6503b58818db974de82443 100644 (file)
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -4,7 +4,7 @@
                <title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?></title>
                <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
                <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
-               <?php if (!defined('DEBUG') || !DEBUG): ?>
+               <?php if (!empty(OC_Util::$core_styles)): ?>
                <link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
                <?php endif ?>
                <?php foreach($_['cssfiles'] as $cssfile): ?>
@@ -15,7 +15,7 @@
                        var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
                        var oc_current_user = '<?php echo OC_User::getUser() ?>';
                </script>
-               <?php if (!defined('DEBUG') || !DEBUG): ?>
+               <?php if (!empty(OC_Util::$core_scripts)): ?>
                <script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
                <?php endif ?>
                <?php foreach($_['jsfiles'] as $jsfile): ?>

diff --git a/lib/app.php b/lib/app.php
index 667633e2647f5e72ae07dbd1da8d4f31431e66f0..e8a5a1291d912e3706ec0708d52e65f0e166a52d 100755 (executable)
--- 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 a65a33b166e0eccf0b56b254f63efd801972f3a9..4bd165862bb5ded1cdacc1ec132b1fb4f02ba31a 100644 (file)
--- 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){