aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche
diff options
context:
space:
mode:
authortcitworld <tcit@tcit.fr>2014-06-07 16:38:39 +0200
committertcitworld <tcit@tcit.fr>2014-06-07 16:38:39 +0200
commit8142d4b1e6794b9ce6ead19166f1c76d9ae4e162 (patch)
treef070a9789d6c125a0c1141e385b59cf0a42247e6 /inc/poche
parentc93a5c137fcabcf771e7bd2d16d3b8d819de16da (diff)
parent35d4e27588d3e7a6ace1f6b101d909f1eceafac9 (diff)
downloadwallabag-8142d4b1e6794b9ce6ead19166f1c76d9ae4e162.tar.gz
wallabag-8142d4b1e6794b9ce6ead19166f1c76d9ae4e162.tar.zst
wallabag-8142d4b1e6794b9ce6ead19166f1c76d9ae4e162.zip
Merge pull request #722 from tcitworld/dev
do not output debug while generating epub
Diffstat (limited to 'inc/poche')
-rwxr-xr-xinc/poche/Poche.class.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 3d1337f3..09a9f5ff 100755
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -1144,6 +1144,7 @@ class Poche
1144 $config = HTMLPurifier_Config::createDefault(); 1144 $config = HTMLPurifier_Config::createDefault();
1145 $config->set('Cache.SerializerPath', CACHE); 1145 $config->set('Cache.SerializerPath', CACHE);
1146 $config->set('HTML.SafeIframe', true); 1146 $config->set('HTML.SafeIframe', true);
1147
1147 //allow YouTube, Vimeo and dailymotion videos 1148 //allow YouTube, Vimeo and dailymotion videos
1148 $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/|www\.dailymotion\.com/embed/video/)%'); 1149 $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/|www\.dailymotion\.com/embed/video/)%');
1149 1150
@@ -1206,9 +1207,8 @@ class Poche
1206 1207
1207 $log = new Logger("wallabag", TRUE); 1208 $log = new Logger("wallabag", TRUE);
1208 $fileDir = CACHE; 1209 $fileDir = CACHE;
1209 1210
1210 1211 $book = new EPub(EPub::BOOK_VERSION_EPUB3, DEBUG_POCHE);
1211 $book = new EPub(EPub::BOOK_VERSION_EPUB3);
1212 $log->logLine("new EPub()"); 1212 $log->logLine("new EPub()");
1213 $log->logLine("EPub class version: " . EPub::VERSION); 1213 $log->logLine("EPub class version: " . EPub::VERSION);
1214 $log->logLine("EPub Req. Zip version: " . EPub::REQ_ZIP_VERSION); 1214 $log->logLine("EPub Req. Zip version: " . EPub::REQ_ZIP_VERSION);