Happy 2015

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

diff --git a/functions/decode/cp855.php b/functions/decode/cp855.php
index bfcd2b2ba12ace645777a4fc0d3d4ddb0009139f..15409196416b29da099264737c56d7834d37a86c 100644 (file)
--- a/functions/decode/cp855.php
+++ b/functions/decode/cp855.php
@@ -1,10 +1,8 @@
 <?php
+
 /**
  * decode/cp855.php
  *
- * Copyright (c) 2003-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * This file contains cp855 decoding function that is needed to read
  * cp855 encoded mails in non-cp855 locale.
  *
@@ -18,6 +16,8 @@
  *   Authors:       Lori Brownell <loribr@microsoft.com>
  *                  K.D. Chang    <a-kchang@microsoft.com>
  *
+ * @copyright 2003-2015 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  * @subpackage decode
@@ -29,11 +29,6 @@
  * @return string $string Decoded string
  */
 function charset_decode_cp855 ($string) {
-    global $default_charset;
-
-    if (strtolower($default_charset) == 'ibm855')
-        return $string;
-
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'ibm855'))
         return $string;
@@ -173,5 +168,3 @@ function charset_decode_cp855 ($string) {
 
     return $string;
 }
-
-?>
\ No newline at end of file