diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-14 21:16:59 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-14 21:16:59 +0000 |
| commit | 4753cc3ebde9867ab4deb1979fb4231b0c847426 (patch) | |
| tree | c6944e947bc84c8716b57b7e2b06ef51efccb3db /core/templates/layout.guest.php | |
| parent | 6da5a2fdd4e8a19ab993b4a1f7de7e45b8922a16 (diff) | |
| parent | f3b30e4658c4dde82b56b458c672fa5edcba5d6b (diff) | |
| download | nextcloud-server-4753cc3ebde9867ab4deb1979fb4231b0c847426.tar.gz nextcloud-server-4753cc3ebde9867ab4deb1979fb4231b0c847426.zip | |
Merge branch 'master' into multi_app_dir
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
Diffstat (limited to 'core/templates/layout.guest.php')
| -rw-r--r-- | core/templates/layout.guest.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 7a968917718..4cdbfd16e52 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_appswebroots = <?php echo $_['apps_paths'] ?>; </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): ?> |