projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Happy New Year
[squirrelmail.git]
/
functions
/
decode
/
iso_8859_15.php
diff --git
a/functions/decode/iso_8859_15.php
b/functions/decode/iso_8859_15.php
index 7b2f33577a33836cf53252013e07f009cb2ccbea..2e9886a59db5dfec9d96df11a664bfa751e26fda 100644
(file)
--- a/
functions/decode/iso_8859_15.php
+++ b/
functions/decode/iso_8859_15.php
@@
-1,10
+1,8
@@
<?php
<?php
+
/**
* decode/iso8859-15.php
*
/**
* decode/iso8859-15.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-15 decoding function that is needed to read
* iso-8859-15 encoded mails in non-iso-8859-15 locale.
*
* This file contains iso-8859-15 decoding function that is needed to read
* iso-8859-15 encoded mails in non-iso-8859-15 locale.
*
@@
-36,6
+34,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
@@
-47,11
+47,6
@@
* @return string $string Decoded string
*/
function charset_decode_iso_8859_15 ($string) {
* @return string $string Decoded string
*/
function charset_decode_iso_8859_15 ($string) {
- global $default_charset;
-
- if (strtolower($default_charset) == 'iso-8859-15')
- return $string;
-
// don't do decoding when there are no 8bit symbols
if (! sq_is8bit($string,'iso-8859-15'))
return $string;
// don't do decoding when there are no 8bit symbols
if (! sq_is8bit($string,'iso-8859-15'))
return $string;
@@
-159,4
+154,3
@@
function charset_decode_iso_8859_15 ($string) {
return $string;
}
return $string;
}
-?>
\ No newline at end of file