X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdecode%2Fiso_8859_16.php;h=7cb2b80e97e153b3a0c19bd0b47fc7015cff18b1;hb=ee27709d9224cc01e605c2478de9d9e4dd41f84c;hp=b1bf326f5f9c396de9e67bb3106fc3e17cb572d7;hpb=e53c9681b4646b7ca1b0071434d360be56a80a6e;p=squirrelmail.git

diff --git a/functions/decode/iso_8859_16.php b/functions/decode/iso_8859_16.php
index b1bf326f..7cb2b80e 100644
--- a/functions/decode/iso_8859_16.php
+++ b/functions/decode/iso_8859_16.php
@@ -2,12 +2,12 @@
 /**
  * decode/iso8859-16.php
  *
- * Copyright (c) 2003-2004 The SquirrelMail Project Team
+ * Copyright (c) 2003-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This file contains iso-8859-16 decoding function that is needed to read
  * iso-8859-16 encoded mails in non-iso-8859-16 locale.
- * 
+ *
  * Original data taken from:
  *  ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-16.TXT
  *
@@ -46,16 +46,11 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_16 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-16')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-16'))
         return $string;
 
-    $iso8869_16 = array(
+    $iso8859_16 = array(
         "\xA0" => ' ',
         "\xA1" => 'Ą',
         "\xA2" => 'ą',