diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-02-07 08:09:53 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-02-07 08:09:53 +0100 |
| commit | 149d079fd4648f761820b13525bbb9064f9d5710 (patch) | |
| tree | d85b8e33b37bece1fd11f49fc58b90595d096bc0 | |
| parent | e969a78cf998a6a5607e605d65b7bf1b35259cb8 (diff) | |
| download | nextcloud-server-149d079fd4648f761820b13525bbb9064f9d5710.tar.gz nextcloud-server-149d079fd4648f761820b13525bbb9064f9d5710.zip | |
Move loading of js_config to templatelayout
Also check for installed flag because this isn't available before setup
| -rw-r--r-- | core/templates/layout.base.php | 1 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 1 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 1 | ||||
| -rw-r--r-- | lib/templatelayout.php | 3 |
4 files changed, 3 insertions, 3 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 47fb75612cf..2049bcb36da 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -7,7 +7,6 @@ <?php foreach ($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> - <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script> <?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 9aabc08acec..69330aa9fce 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -8,7 +8,6 @@ <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> - <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script> <?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 2547278547f..de38239572b 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -8,7 +8,6 @@ <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> - <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script> <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 37ece91047f..a14c36c93d2 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -36,6 +36,9 @@ class OC_TemplateLayout extends OC_Template { // Add the js files $jsfiles = self::findJavascriptFiles(OC_Util::$scripts); $this->assign('jsfiles', array(), false); + if (OC_Config::getValue('installed', false)) { + $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config')); + } if (!empty(OC_Util::$core_scripts)) { $this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false)); } |