diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-01-23 11:30:40 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-01-23 11:30:40 +0100 |
| commit | c8bbbb48d3214d3ce141110aebcd59577d9e5c40 (patch) | |
| tree | c7f41e33783878ee664f919ac5818066047dea10 /core/templates/layout.base.php | |
| parent | 48949ba04acacd5cc4039ba15266619ebe61a52b (diff) | |
| parent | c986dbe5739347f3fd40fa17132169de9fd9494c (diff) | |
| download | nextcloud-server-c8bbbb48d3214d3ce141110aebcd59577d9e5c40.tar.gz nextcloud-server-c8bbbb48d3214d3ce141110aebcd59577d9e5c40.zip | |
Merge master...
Diffstat (limited to 'core/templates/layout.base.php')
| -rw-r--r-- | core/templates/layout.base.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 47fb75612cf..08083a2924a 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -7,7 +7,15 @@ <?php foreach ($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" /> <?php endforeach; ?> +<<<<<<< HEAD <script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script> +======= + <script type="text/javascript"> + var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>; + var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; + var oc_requesttoken = '<?php echo $_['requesttoken']; ?>'; + </script> +>>>>>>> master <?php foreach ($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> <?php endforeach; ?> |