From 1bca60fa32ba8a0f08b506560f2ff9190ac9a601 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Thu, 13 Jan 2011 11:12:04 -0700 Subject: [PATCH] Use ini_restore(). --- framework/Util/lib/Horde/String.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/Util/lib/Horde/String.php b/framework/Util/lib/Horde/String.php index f282e8a68..433c1a125 100644 --- a/framework/Util/lib/Horde/String.php +++ b/framework/Util/lib/Horde/String.php @@ -146,11 +146,11 @@ class Horde_String /* We need to tack an extra character temporarily because of a bug * in iconv() if the last character is not a 7 bit ASCII * character. */ - $oldTrackErrors = ini_set('track_errors', 1); unset($php_errormsg); + ini_set('track_errors', 1); $out = @iconv($from, $to . '//TRANSLIT', $input . 'x'); $errmsg = isset($php_errormsg); - ini_set('track_errors', $oldTrackErrors); + ini_restore('track_errors'); if (!$errmsg) { return self::substr($out, 0, -1, $to); } -- 2.11.0