There are too many modified files being committed without the copyright year being...

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

diff --git a/functions/decode/iso_ir_111.php b/functions/decode/iso_ir_111.php
index c391214ad5dcedd0e1fd8c8452af53dcb4066d9e..c37a89784756f89c8cfe20e0076c0555f6ff66d7 100644 (file)
--- a/functions/decode/iso_ir_111.php
+++ b/functions/decode/iso_ir_111.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
  * decode/iso-ir-111.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-ir-111 decoding function that is needed to read
  * iso-ir-111 encoded mails in non-iso-ir-111 locale.
  *
@@ -39,6 +37,8 @@
  * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
+ * @copyright &copy; 2003-2009 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  * @subpackage decode
@@ -50,11 +50,6 @@
  * @return string Decoded string
  */
 function charset_decode_iso_ir_111 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-ir-111')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'iso-ir-111'))
         return $string;
@@ -162,4 +157,3 @@ function charset_decode_iso_ir_111 ($string) {
 
     return $string;
 }
-?>
\ No newline at end of file