Merge pull request #3111 from owncloud/csp-audio

Allow loading of external media ressources

diff --cc config/config.sample.php
index a3b7cbaca46139c4629f96b1a12cf187e4c8e86f,d85a518634f69240fc12ce3e4a33e255f64df448..72834009201931033319d1e8e69b78ed5346bc00
--- 1/config/config.sample.php
--- 2/config/config.sample.php
+++ b/config/config.sample.php
@@@ -146,12 -146,8 +146,12 @@@ $CONFIG = array
  "remember_login_cookie_lifetime" => 60*60*24*15,
  
  /* Custom CSP policy, changing this will overwrite the standard policy */
- "custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:",
+ "custom_csp_policy" => "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; frame-src *; img-src *; font-src 'self' data:; media-src *",
  
 +/* Enable/disable X-Frame-Restriction */
 +/* HIGH SECURITY RISK IF DISABLED*/
 +"xframe_restriction" => true,
 +      
  /* The directory where the user data is stored, default to data in the owncloud
   * directory. The sqlite database is also stored here, when sqlite is used.
   */

diff --cc lib/template.php
Simple merge