diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-09-12 21:43:35 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-09-12 21:43:35 +0200 |
| commit | c9d26631592ba58d8026a14e7f637cfe835fa15d (patch) | |
| tree | b6bc91006e0207a2e2b26ba5d1205853e0ca7fda /lib/templatelayout.php | |
| parent | b9167196fb331d7197210e4a130e03d32d839b8a (diff) | |
| parent | c7ca86799b2608609ead7ecd2d84d0bbd47c6548 (diff) | |
| download | nextcloud-server-c9d26631592ba58d8026a14e7f637cfe835fa15d.tar.gz nextcloud-server-c9d26631592ba58d8026a14e7f637cfe835fa15d.zip | |
Merge branch 'master' into fileapi-foreward
Diffstat (limited to 'lib/templatelayout.php')
| -rw-r--r-- | lib/templatelayout.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 0024c9d4960..0b868a39e49 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -58,7 +58,7 @@ class OC_TemplateLayout extends OC_Template { if (OC_Config::getValue('installed', false) && $renderas!='error') { $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter); } - if (!empty(OC_Util::$core_scripts)) { + if (!empty(OC_Util::$coreScripts)) { $this->append( 'jsfiles', OC_Helper::linkToRemoteBase('core.js', false) . $versionParameter); } foreach($jsfiles as $info) { @@ -71,7 +71,7 @@ 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)) { + if (!empty(OC_Util::$coreStyles)) { $this->append( 'cssfiles', OC_Helper::linkToRemoteBase('core.css', false) . $versionParameter); } foreach($cssfiles as $info) { |