diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-05-29 12:50:28 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-05-29 12:50:28 +0200 |
| commit | 87f01ea2e97715ac5df4ef7a6741cc26f3a5cd1b (patch) | |
| tree | 558818975ac41403e7d55ad07c5b0ac29806e907 /inc/poche | |
| parent | ab157bbb75ba226917145c9bf906cbf764a85cd0 (diff) | |
| parent | 0b9bb8cb7868f24137c5d8b85c39cc88ea877411 (diff) | |
| download | wallabag-87f01ea2e97715ac5df4ef7a6741cc26f3a5cd1b.tar.gz wallabag-87f01ea2e97715ac5df4ef7a6741cc26f3a5cd1b.tar.zst wallabag-87f01ea2e97715ac5df4ef7a6741cc26f3a5cd1b.zip | |
Merge pull request #707 from mariroz/dev
update to 3.2 version of full-text-rss, issue #694
Diffstat (limited to 'inc/poche')
| -rwxr-xr-x | inc/poche/Poche.class.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 1b69cd61..37cf66a3 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
| @@ -1142,11 +1142,12 @@ class Poche | |||
| 1142 | * return new purifier object with actual config | 1142 | * return new purifier object with actual config |
| 1143 | */ | 1143 | */ |
| 1144 | protected function getPurifier() { | 1144 | protected function getPurifier() { |
| 1145 | $config = HTMLPurifier_Config::createDefault(); | 1145 | $config = HTMLPurifier_Config::createDefault(); |
| 1146 | $config->set('Cache.SerializerPath', CACHE); | 1146 | $config->set('Cache.SerializerPath', CACHE); |
| 1147 | $config->set('HTML.SafeIframe', true); | 1147 | $config->set('HTML.SafeIframe', true); |
| 1148 | $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/)%'); //allow YouTube and Vimeo$purifier = new HTMLPurifier($config); | 1148 | //allow YouTube, Vimeo and dailymotion videos |
| 1149 | 1149 | $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/|www\.dailymotion\.com/embed/video/)%'); | |
| 1150 | |||
| 1150 | return new HTMLPurifier($config); | 1151 | return new HTMLPurifier($config); |
| 1151 | } | 1152 | } |
| 1152 | 1153 | ||