summaryrefslogtreecommitdiffstats
path: root/dependencyinjection
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-08-29 13:30:38 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-08-29 13:30:38 +0200
commit4d7f53380d31154709faa3f9d6cdc467ff141951 (patch)
treefdbe6e2e76b7b3c3483cc50216aaac8ffd34dc07 /dependencyinjection
parenta73fe145a2856d6d075f8541f28c70b5cf01e1db (diff)
allow more than one article enhancer per url based on the url regex, also allow embedded youtube videos that start with //
Diffstat (limited to 'dependencyinjection')
-rw-r--r--dependencyinjection/dicontainer.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/dependencyinjection/dicontainer.php b/dependencyinjection/dicontainer.php
index 9d9a085b0..de49236c6 100644
--- a/dependencyinjection/dicontainer.php
+++ b/dependencyinjection/dicontainer.php
@@ -109,7 +109,9 @@ class DIContainer extends BaseContainer {
$config->set('Cache.SerializerPath', $directory);
$config->set('HTML.SafeIframe', true);
$config->set('URI.SafeIframeRegexp',
- '%^http://(www.youtube(?:-nocookie)?.com/embed/|player.vimeo.com/video/)%'); //allow YouTube and Vimeo
+ '%^(?:https?:)?//(' .
+ 'www.youtube(?:-nocookie)?.com/embed/|' .
+ 'player.vimeo.com/video/)%'); //allow YouTube and Vimeo
return new \HTMLPurifier($config);
});