diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-10-26 00:20:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-26 00:20:27 +0200 |
| commit | 9a70c137d2afa3dc1a6f6361c3fa36d5a9ca4f71 (patch) | |
| tree | bdfcaaca14022c13bcc2088b791ce2a16dd562db /core/templates/layout.base.php | |
| parent | 1b6ba5ad322cb3d6e2139393798d243f1d4cc68a (diff) | |
| parent | 015affb082a7c9bbfeef552b3c74e5ae77e01ab3 (diff) | |
| download | nextcloud-server-9a70c137d2afa3dc1a6f6361c3fa36d5a9ca4f71.tar.gz nextcloud-server-9a70c137d2afa3dc1a6f6361c3fa36d5a9ca4f71.zip | |
Merge pull request #1917 from nextcloud/ocjs_inline
Inline oc.js when possible!
Diffstat (limited to 'core/templates/layout.base.php')
| -rw-r--r-- | core/templates/layout.base.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 3f13523afcb..d6d70f31362 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -18,6 +18,11 @@ <?php foreach($_['printcssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print"> <?php endforeach; ?> + <?php if (isset($_['inline_ocjs'])): ?> + <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" type="text/javascript"> + <?php print_unescaped($_['inline_ocjs']); ?> + </script> + <?php endif; ?> <?php foreach ($_['jsfiles'] as $jsfile): ?> <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script> <?php endforeach; ?> |