diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-06-07 17:28:39 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-06-07 21:35:40 +0200 |
| commit | 4260dce826cc0572371d5ab0d30ecf5f1ecb072a (patch) | |
| tree | 12eef3538637e35fcb8995a8be45327120962a73 /core | |
| parent | d4f6f3e9355979aedb174d6f9b5f60380934aca9 (diff) | |
| download | nextcloud-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 'core')
| -rw-r--r-- | core/templates/layout.guest.php | 4 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 7f5a4d50fc6..55cc8008d9a 100644 --- 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 8f6c029007f..e04fcabf137 100644 --- 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): ?> |