X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Fblock.tidy.php;h=d74de2f102485ef7efa7ca2337b0106373de6dba;hb=b3454c7f74fd5fd547c6e36f3eecd7740d9bf61f;hp=13c20a4117225ad8378b691ba1cc733cb2acc614;hpb=a7de4ef724d1a3b0bf978a50ce7cc9d23412c7a0;p=platal.git

diff --git a/plugins/block.tidy.php b/plugins/block.tidy.php
index 13c20a4..d74de2f 100644
--- a/plugins/block.tidy.php
+++ b/plugins/block.tidy.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  Copyright (C) 2003-2008 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,28 +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');
-tidy_set_encoding('utf8');
-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
@@ -48,12 +41,13 @@ unset($tidy_o, $tydy_off);
  * File:     block.min_perms.php
  * Type:     block
  * Name:     min_perms
- * Purpose:  
+ * Purpose:
  * -------------------------------------------------------------
  */
 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: