Happy New Year

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

diff --git a/functions/decode/koi8_r.php b/functions/decode/koi8_r.php
index 6da341254443750a3a5b4296c9c3debbe84fd917..599a0c7ca3013bbb6e4ae99a7df2b440822b55e7 100644 (file)
--- a/functions/decode/koi8_r.php
+++ b/functions/decode/koi8_r.php
@@ -1,10 +1,8 @@
 <?php
 <?php

+

 /**
  * decode/koi8-r.php
  *
 /**
  * decode/koi8-r.php
  *

- * Copyright (c) 2003-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *

  * This file contains koi8-r decoding function that is needed to read
  * koi8-r encoded mails in non-koi8-r locale.
  *
  * This file contains koi8-r decoding function that is needed to read
  * koi8-r encoded mails in non-koi8-r locale.
  *


@@ -34,6 +32,8 @@
  * internal or external distribution as long as this notice remains
  * attached.
  *
  * 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
  * @version $Id$
  * @package squirrelmail
  * @subpackage decode


@@ -45,11 +45,6 @@
  * @return string Decoded string
  */
 function charset_decode_koi8_r ($string) {
  * @return string Decoded string
  */
 function charset_decode_koi8_r ($string) {

-    global $default_charset;
-
-    if (strtolower($default_charset) == 'koi8-r')
-        return $string;
-

     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'koi8-r'))
         return $string;
     // don't do decoding when there are no 8bit symbols
     if (! sq_is8bit($string,'koi8-r'))
         return $string;


@@ -189,4 +184,3 @@ function charset_decode_koi8_r ($string) {
 
     return $string;
 }
 
     return $string;
 }

-?>
\ No newline at end of file