Happy New Year!

[squirrelmail.git] / functions / decode / iso_8859_1.php

diff --git a/functions/decode/iso_8859_1.php b/functions/decode/iso_8859_1.php
index 676122cca9cae07df77d857dec899af93472f0a1..e547753cad74242108a20b320c36529700cddbee 100644 (file)
--- a/functions/decode/iso_8859_1.php
+++ b/functions/decode/iso_8859_1.php
@@ -1,13 +1,13 @@
 <?php
+
 /**
  * decode/iso8859-1.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-1 decoding function that is needed to read
  * iso-8859-1 encoded mails in non-iso-8859-1 locale.
  *
+ * @copyright 2003-2011 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  * @subpackage decode
@@ -19,11 +19,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_1 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-1')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-8859-1'))
         return $string;
@@ -36,5 +31,3 @@ function charset_decode_iso_8859_1 ($string) {
     $string = preg_replace("/([\241-\377])/e","'&#' . ord('\\1') . ';'",$string);
     return $string;
 }
-
-?>
\ No newline at end of file