From: tcit Date: Sat, 7 Jun 2014 14:36:57 +0000 (+0200) Subject: up to date X-Git-Tag: 1.7.1^2~14^2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=35d4e27588d3e7a6ace1f6b101d909f1eceafac9;p=github%2Fwallabag%2Fwallabag.git up to date --- 35d4e27588d3e7a6ace1f6b101d909f1eceafac9 diff --cc inc/poche/Poche.class.php index 4139c4f4,3d1337f3..09a9f5ff --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@@ -1145,7 -1144,8 +1144,9 @@@ class Poch $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.SerializerPath', CACHE); $config->set('HTML.SafeIframe', true); - $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/)%'); //allow YouTube and Vimeo$purifier = new HTMLPurifier($config); ++ + //allow YouTube, Vimeo and dailymotion videos + $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/|www\.dailymotion\.com/embed/video/)%'); return new HTMLPurifier($config); } @@@ -1203,12 -1203,12 +1204,11 @@@ . "\n"; $bookEnd = "\n\n"; - + $log = new Logger("wallabag", TRUE); $fileDir = CACHE; - -- - $book = new EPub(EPub::BOOK_VERSION_EPUB3); + + $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE); $log->logLine("new EPub()"); $log->logLine("EPub class version: " . EPub::VERSION); $log->logLine("EPub Req. Zip version: " . EPub::REQ_ZIP_VERSION);