X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fblock.tidy.php;h=20aeb0d23815055cdb4251a14b94f6779e17b73e;hb=7727ffc74dd19bc3dd2d7b5c2b44e892c2e63f5d;hp=3af18ee71ff0541c6b84b5932ce5de360c4c0e34;hpb=50a40a33a496131e817df875607ea5542d096a64;p=platal.git

diff --git a/plugins/block.tidy.php b/plugins/block.tidy.php
index 3af18ee..20aeb0d 100644
--- a/plugins/block.tidy.php
+++ b/plugins/block.tidy.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,27 +19,21 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-$tidy_on = Array(
-    'drop-empty-paras',
-    'drop-font-tags',
-    'drop-proprietary-attributes',
-    'hide-comments',
-    'logical-emphasis',
-    'output-xhtml',
-    'replace-color',
-    'show-body-only'
-);
-$tidy_off = Array(
-    'clean',
-    'join-styles',
-    'join-classes'
-);
-
-foreach($tidy_on as $opt) { tidy_setopt($opt, true); }
-foreach($tidy_off as $opt) { tidy_setopt($opt, false); }
-tidy_setopt('alt-text', '[ inserted by TIDY ]');
-tidy_setopt('wrap', '120');
-unset($tidy_o, $tydy_off);
+global $tidy_config;
+$tidy_config = array(
+    'drop-empty-paras' => true,
+    'drop-font-tags' => true,
+    'drop-proprietary-attributes' => true,
+    'hide-comments' => true,
+    'logical-emphasis' => true,
+    'output-xhtml' => true,
+    'replace-color' => true,
+    'show-body-only' => true,
+    'clean' => false,
+    'join-styles' => false,
+    'join-classes' => false,
+    'alt-text' => '[ inserted by TIDY ]',
+    'wrap' => '120');
 
 /*
  * Smarty plugin
@@ -52,7 +46,9 @@ unset($tidy_o, $tydy_off);
  */
 function smarty_block_tidy($params, $content, &$smarty)
 {
-    return tidy_repair_string($content);
+    global $tidy_config;
+    return tidy_repair_string($content, $tidy_config, 'utf8');
 }
 
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
 ?>