Move handling of core remotes to OC_TemplateLayout

diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index bfd23a9ce97f35d25e4fc62b9bdc887c4f821c73..c113a4db24e0570e39ec6b8354ae0eb2b1c62f5b 100644 (file)
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -4,9 +4,6 @@
                <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 (!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): ?>
                        <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
                <?php endforeach; ?>
@@ -14,9 +11,6 @@
                        var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
                        var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
                </script>
-               <?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): ?>
                        <script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
                <?php endforeach; ?>

diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 9a5a056eb2b4801cc041165afca38c0687f35db6..0d2e71c180f24b6f25bfbcb6f18ed7982c157746 100644 (file)
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -4,9 +4,6 @@
                <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 (!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): ?>
                        <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
                <?php endforeach; ?>
@@ -14,9 +11,6 @@
                        var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
                        var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
                </script>
-               <?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): ?>
                        <script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
                <?php endforeach; ?>

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 89b8027fc0f2835be9116ff9db850b0f2e660be2..4fa0fd01360d7ddec3265dd6e96276d0354c92c6 100644 (file)
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -4,9 +4,6 @@
                <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 (!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): ?>
                        <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
                <?php endforeach; ?>
@@ -15,9 +12,6 @@
                        var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
                        var oc_current_user = '<?php echo OC_User::getUser() ?>';
                </script>
-               <?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): ?>
                        <script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
                <?php endforeach; ?>

diff --git a/lib/app.php b/lib/app.php
index f1e4f965efd5233430c4e73e7c05f893b550c71c..28f1f16ebafda92795e03b43312f1c3cb858ca0f 100755 (executable)
--- a/lib/app.php
+++ b/lib/app.php
@@ -69,11 +69,6 @@ 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/templatelayout.php b/lib/templatelayout.php
index ad013edad8cee736e6fb66ae2864e1b534cebc83..d72f5552fde504ebd970d6cc8b15680fb3e1a9f1 100644 (file)
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -41,9 +41,17 @@ class OC_TemplateLayout extends OC_Template {
                }
                $this->assign( 'apps_paths', str_replace('\\/', '/',json_encode($apps_paths)),false ); // Ugly unescape slashes waiting for better solution
 
+               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');
+               }
+
                // Add the js files
                $jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
                $this->assign('jsfiles', array(), false);
+               if (!empty(OC_Util::$core_scripts)) {
+                       $this->append( 'jsfiles', OC_Helper::linkToRemote('core.js', false));
+               }
                foreach($jsfiles as $info) {
                        $root = $info[0];
                        $web = $info[1];
@@ -53,8 +61,10 @@ class OC_TemplateLayout extends OC_Template {
 
                // Add the css files
                $cssfiles = self::findStylesheetFiles(OC_Util::$styles);
-
                $this->assign('cssfiles', array());
+               if (!empty(OC_Util::$core_styles)) {
+                       $this->append( 'cssfiles', OC_Helper::linkToRemote('core.css', false));
+               }
                foreach($cssfiles as $info) {
                        $root = $info[0];
                        $web = $info[1];