From 709af1f911081cac3642b8486726ef57c5a70340 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Sat, 25 Feb 2006 07:37:53 +0000
Subject: [PATCH] les fichiers de charsets ne sont plus inclus mais
 include_spip(), et $charset n'est plus valable

---
 ecrire/charsets/cp1251.php           | 2 +-
 ecrire/charsets/cp1256.php           | 2 +-
 ecrire/charsets/html.php             | 2 +-
 ecrire/charsets/iso-8859-1.php       | 2 +-
 ecrire/charsets/iso-8859-15.php      | 2 +-
 ecrire/charsets/iso-8859-6.php       | 2 +-
 ecrire/charsets/iso-8859-9.php       | 2 +-
 ecrire/charsets/mathml.php           | 2 +-
 ecrire/charsets/translit.php         | 2 +-
 ecrire/charsets/translitcomplexe.php | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ecrire/charsets/cp1251.php b/ecrire/charsets/cp1251.php
index e2940e5439..726da77c50 100644
--- a/ecrire/charsets/cp1251.php
+++ b/ecrire/charsets/cp1251.php
@@ -2,7 +2,7 @@
 
 // cyrillic - ref. http://czyborra.com/charsets/cyrillic.html
 
-$GLOBALS['CHARSET'][$charset] = array (
+$GLOBALS['CHARSET']['cp1251'] = array (
 0x80=>0x0402, 0x81=>0x0403, 0x82=>0x201A, 0x83=>0x0453, 0x84=>0x201E,
 0x85=>0x2026, 0x86=>0x2020, 0x87=>0x2021, 0x88=>0x20AC, 0x89=>0x2030,
 0x8A=>0x0409, 0x8B=>0x2039, 0x8C=>0x040A, 0x8D=>0x040C, 0x8E=>0x040B,
diff --git a/ecrire/charsets/cp1256.php b/ecrire/charsets/cp1256.php
index ceb1c4b21c..5036a0e7cc 100644
--- a/ecrire/charsets/cp1256.php
+++ b/ecrire/charsets/cp1256.php
@@ -3,7 +3,7 @@
 // arabic - george kandalaft
 // http://www.microsoft.com/typography/unicode/1256.htm
 
-$GLOBALS['CHARSET'][$charset] = array (
+$GLOBALS['CHARSET']['cp1256'] = array (
 0x80=>0x20AC, 0x81=>0x067E, 0x82=>0x201A, 0x83=>0x0192, 0x84=>0x201E,
 0x85=>0x2026, 0x86=>0x2020, 0x87=>0x2021, 0x88=>0x02C6, 0x89=>0x2030,
 0x8A=>0x0679, 0x8B=>0x2039, 0x8C=>0x0152, 0x8D=>0x0686, 0x8E=>0x0698,
diff --git a/ecrire/charsets/html.php b/ecrire/charsets/html.php
index bdeee64214..f50a24540f 100644
--- a/ecrire/charsets/html.php
+++ b/ecrire/charsets/html.php
@@ -2,7 +2,7 @@
 
 // entites html (a completer eventuellement)
 
-$GLOBALS['CHARSET'][$charset] = array (
+$GLOBALS['CHARSET']['html'] = array (
 'ldquo'=>'&#147;', 'rdquo'=>'&#148;', 'cent'=>'&#162;', 'pound'=>'&#163;',
 'curren'=>'&#164;', 'yen'=>'&#165;', 'brvbar'=>'&#166;', 'sect'=>'&#167;',
 'uml'=>'&#168;', 'ordf'=>'&#170;', 'laquo'=>'&#171;', 'not'=>'&#172;',
diff --git a/ecrire/charsets/iso-8859-1.php b/ecrire/charsets/iso-8859-1.php
index 31c9511936..8df456ceb1 100644
--- a/ecrire/charsets/iso-8859-1.php
+++ b/ecrire/charsets/iso-8859-1.php
@@ -2,7 +2,7 @@
 
 # charset iso-8859-1
 
-$GLOBALS['CHARSET'][$charset] = array (
+$GLOBALS['CHARSET']['iso-8859-1'] = array (
 
 128=>128, 129=>129, 130=>130, 131=>131, 132=>132, 133=>133, 134=>134, 135=>135,
 136=>136, 137=>137, 138=>138, 139=>139, 140=>140, 141=>141, 142=>142, 143=>143,
diff --git a/ecrire/charsets/iso-8859-15.php b/ecrire/charsets/iso-8859-15.php
index aeb6bd64e0..99467eeb25 100644
--- a/ecrire/charsets/iso-8859-15.php
+++ b/ecrire/charsets/iso-8859-15.php
@@ -14,6 +14,6 @@ $trans[188]=338;
 $trans[189]=339;
 $trans[190]=376;
 
-$GLOBALS['CHARSET'][$charset] = $trans;
+$GLOBALS['CHARSET']['iso-8859-15'] = $trans;
 
 ?>
diff --git a/ecrire/charsets/iso-8859-6.php b/ecrire/charsets/iso-8859-6.php
index 3e973e7be9..93fb79886f 100644
--- a/ecrire/charsets/iso-8859-6.php
+++ b/ecrire/charsets/iso-8859-6.php
@@ -23,6 +23,6 @@ $mod = Array(
 foreach ($mod as $num=>$val)
 	$trans[$num]=$val;
 
-$GLOBALS['CHARSET'][$charset] = $trans;
+$GLOBALS['CHARSET']['iso-8859-6'] = $trans;
 
 ?>
\ No newline at end of file
diff --git a/ecrire/charsets/iso-8859-9.php b/ecrire/charsets/iso-8859-9.php
index f0520c9099..33ead16374 100644
--- a/ecrire/charsets/iso-8859-9.php
+++ b/ecrire/charsets/iso-8859-9.php
@@ -12,6 +12,6 @@ $trans[253]=305; //inodot
 $trans[254]=351; //scedil
 $trans[222]=350; //Scedil
 
-$GLOBALS['CHARSET'][$charset] = $trans;
+$GLOBALS['CHARSET']['iso-8859-9'] = $trans;
 
 ?>
\ No newline at end of file
diff --git a/ecrire/charsets/mathml.php b/ecrire/charsets/mathml.php
index 318622d10d..9264fdcc0d 100644
--- a/ecrire/charsets/mathml.php
+++ b/ecrire/charsets/mathml.php
@@ -2,7 +2,7 @@
 
 // mathml
 
-$GLOBALS['CHARSET'][$charset] = array (
+$GLOBALS['CHARSET']['mathml'] = array (
 
 'ac' => '&#xE207;',
 'acd' => '&#xE3A6;',
diff --git a/ecrire/charsets/translit.php b/ecrire/charsets/translit.php
index 9f8eaf337d..b707f22db2 100644
--- a/ecrire/charsets/translit.php
+++ b/ecrire/charsets/translit.php
@@ -2,7 +2,7 @@
 
 // translitteration simple
 
-$GLOBALS['CHARSET'][$charset] = array (
+$GLOBALS['CHARSET']['translit'] = array (
 // latin
 128=>'euro', 131=>'f', 140=>'OE', 147=>'\'\'', 148=>'\'\'', 153=>'TM', 156=>'oe', 159=>'Y', 160=>' ',
 161=>'!', 162=>'c', 163=>'L', 164=>'O', 165=>'yen',166=>'|',
diff --git a/ecrire/charsets/translitcomplexe.php b/ecrire/charsets/translitcomplexe.php
index f61afdff24..a804a66bb5 100644
--- a/ecrire/charsets/translitcomplexe.php
+++ b/ecrire/charsets/translitcomplexe.php
@@ -34,6 +34,6 @@ $translit_c = array (
 
 foreach($translit_c as $u=>$t)
 	$trans[$u] = $t;
-$GLOBALS['CHARSET'][$charset] = $trans;
+$GLOBALS['CHARSET']['translitcomplexe'] = $trans;
 
 ?>
-- 
GitLab