X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdecode%2Fiso_8859_14.php;h=50cd071849bc4fd956fddf3035f93e30c80a44e3;hb=24e8917ead46268f6a4264900c832b4a5c37ee84;hp=50fae3f8548d3c33177a7e0ad8f4f3af8aa6e2cc;hpb=3e0964e02c2da49cb25a17c28a62d3ab22012d5b;p=squirrelmail.git

diff --git a/functions/decode/iso_8859_14.php b/functions/decode/iso_8859_14.php
index 50fae3f8..50cd0718 100644
--- a/functions/decode/iso_8859_14.php
+++ b/functions/decode/iso_8859_14.php
@@ -1,13 +1,11 @@
 <?php
+
 /**
  * decode/iso8859-14.php
  *
- * Copyright (c) 2003-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * This file contains iso-8859-14 decoding function that is needed to read
  * iso-8859-14 encoded mails in non-iso-8859-14 locale.
- * 
+ *
  * Original data taken from:
  *  ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-14.TXT
  *
@@ -36,6 +34,8 @@
  *  internal or external distribution as long as this notice remains
  *  attached.
  *
+ * @copyright 2003-2020 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  * @subpackage decode
@@ -44,14 +44,9 @@
 /**
  * Decode iso8859-14 encoded string
  * @param string $string Encoded string
- * @return string $string Decoded string 
+ * @return string $string Decoded string
  */
 function charset_decode_iso_8859_14 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-14')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-14'))
         return $string;
@@ -159,4 +154,3 @@ function charset_decode_iso_8859_14 ($string) {
 
     return $string;
 }
-?>
\ No newline at end of file