aboutsummaryrefslogtreecommitdiffstats
path: root/lib/template.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-02-08 00:11:54 +0100
committerRobin Appelman <icewind@owncloud.com>2013-02-08 00:11:54 +0100
commitf93f9dd50cce6b6e2ed4eeca2d34b2bac82e0350 (patch)
treec76b2eabb63ed308eb882468cb2a74042e6f9d53 /lib/template.php
parent697536cf6ad1c9a862c32605b807172dfa680d22 (diff)
parent3bd33b69a1c37cee5c3d180ec8952a611aabb4d1 (diff)
downloadnextcloud-server-f93f9dd50cce6b6e2ed4eeca2d34b2bac82e0350.tar.gz
nextcloud-server-f93f9dd50cce6b6e2ed4eeca2d34b2bac82e0350.zip
merge master into trash_fileactions
Diffstat (limited to 'lib/template.php')
-rw-r--r--lib/template.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/template.php b/lib/template.php
index 238d8a8ad0f..fb9f7ad62d9 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -192,7 +192,7 @@ class OC_Template{
// Content Security Policy
// If you change the standard policy, please also change it in config.sample.php
- $policy = OC_Config::getValue('custom_csp_policy', 'default-src \'self\'; script-src \'self\' \'unsafe-eval\'; style-src \'self\' \'unsafe-inline\'; frame-src *; img-src *');
+ $policy = OC_Config::getValue('custom_csp_policy', 'default-src \'self\'; script-src \'self\' \'unsafe-eval\'; style-src \'self\' \'unsafe-inline\'; frame-src *; img-src *; font-src \'self\' data:');
header('Content-Security-Policy:'.$policy); // Standard
header('X-WebKit-CSP:'.$policy); // Older webkit browsers