Author: cedric@yterium.com
Date: Thu Jul 27 23:04:31 2006
New Revision: 4235
Log:
import charset et pas d'htmlentities a l'affichage dans l'admin
Modified:
_plugins_branche_stable_/_spip_1_9_0_/csv_import/inc/csvimport.php
Modified: _plugins_branche_stable_/_spip_1_9_0_/csv_import/inc/csvimport.php
--- _plugins_branche_stable_/_spip_1_9_0_/csv_import/inc/csvimport.php (original)
+++ _plugins_branche_stable_/_spip_1_9_0_/csv_import/inc/csvimport.php Thu Jul 27 23:04:31 2006
@@ -186,11 +186,10 @@
*/
function csvimport_importcharset($texte){
- return corriger_caracteres_windows(importer_charset($texte, 'iso-8859-1'),'iso-8859-1');
+ return importer_charset($texte,'iso-8859-1');
}
function csvimport_importcsv($file, $head = false, $delim = ",", $enclos = '"', $len = 10000) {
- include_spip('inc/charsets');
$return = false;
$handle = fopen($file, "r");
if ($handle){
@@ -258,7 +257,7 @@
}
echo "<tr>";
foreach($row as $key=>$value)
- echo "<td>" . htmlentities($value) . "</td>";
+ echo "<td>" . $value . "</td>";
echo "</tr>\n";
}
if ($nb_data>$nombre_lignes){
@@ -291,7 +290,7 @@
else{
$output .= "<tr>";
foreach($ligne as $value){
- $output .= "<td>" . htmlentities($value) . "</td>";
+ $output .= "<td>" . $value . "</td>";
}
$output .= "</tr>\n";
}