diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gettext/gettext.inc.php | 2 | ||||
| -rw-r--r-- | lib/jimIcon.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/gettext/gettext.inc.php b/lib/gettext/gettext.inc.php index ed5be6bbd..ef36924c7 100644 --- a/lib/gettext/gettext.inc.php +++ b/lib/gettext/gettext.inc.php @@ -167,7 +167,7 @@ function _check_locale_and_function($function=false) { function _get_codeset($domain=null) { global $text_domains, $default_domain, $LC_CATEGORIES; if (!isset($domain)) $domain = $default_domain; - return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding'); + return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('default_charset'); } /** diff --git a/lib/jimIcon.php b/lib/jimIcon.php index 940701bcc..d976c808b 100644 --- a/lib/jimIcon.php +++ b/lib/jimIcon.php @@ -106,7 +106,7 @@ class jimIcon { // See if we can parse it (might be PNG format here) $i = @imagecreatefromstring($data); if ($i) { - imagesavealpha($img, true); + imagesavealpha($i, true); return $i; } @@ -267,4 +267,4 @@ class jimIcon { return $img; } } -?>
\ No newline at end of file +?> |