X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fdecode%2Fiso_8859_3.php;h=916fe587b4e592c5d88899c6444064023c27fa93;hb=22387c8d44f3ab104db6e19180d3775a45762359;hp=a7410fe8d45c56e8dcfca668003db18e6458622e;hpb=e53c9681b4646b7ca1b0071434d360be56a80a6e;p=squirrelmail.git

diff --git a/functions/decode/iso_8859_3.php b/functions/decode/iso_8859_3.php
index a7410fe8..916fe587 100644
--- a/functions/decode/iso_8859_3.php
+++ b/functions/decode/iso_8859_3.php
@@ -1,13 +1,11 @@
 <?php
+
 /**
  * decode/iso8859-3.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-3 decoding function that is needed to read
  * iso-8859-3 encoded mails in non-iso-8859-3 locale.
- * 
+ *
  * Original data taken from:
  *  ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/8859-3.TXT
  *
@@ -35,6 +33,8 @@
  *  internal or external distribution as long as this notice remains
  *  attached.
  *
+ * @copyright 2003-2017 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  * @subpackage decode
@@ -46,11 +46,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_3 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-3')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-3'))
         return $string;
@@ -151,4 +146,3 @@ function charset_decode_iso_8859_3 ($string) {
 
     return $string;
 }
-?>
\ No newline at end of file