diff options
Diffstat (limited to 'lib/templatelayout.php')
| -rw-r--r-- | lib/templatelayout.php | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 4173e008ba7..83d36199986 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -28,23 +28,16 @@ class OC_TemplateLayout extends OC_Template { break; } } + $apps_paths = array(); + foreach(OC_App::getEnabledApps() as $app) { + $apps_paths[$app] = OC_App::getAppWebPath($app); + } + $this->assign( 'apps_paths', str_replace('\\/', '/', json_encode($apps_paths)), false ); // Ugly unescape slashes waiting for better solution } else if ($renderas == 'guest') { parent::__construct('core', 'layout.guest'); } else { parent::__construct('core', 'layout.base'); } - - $apps_paths = array(); - foreach(OC_App::getEnabledApps() as $app) { - $apps_paths[$app] = OC_App::getAppWebPath($app); - } - $this->assign( 'apps_paths', str_replace('\\/', '/', json_encode($apps_paths)), false ); // Ugly unescape slashes waiting for better solution - - if (OC_Config::getValue('installed', false) && !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); |