From: Jan Schneider Date: Sun, 3 Oct 2010 01:26:09 +0000 (+0200) Subject: Remove _cachedCharset(). X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=27ff6de39d890ee489ffe09a75d06126526ec97a;p=horde.git Remove _cachedCharset(). --- diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php index dff0bcdb2..4543cc034 100644 --- a/framework/Core/lib/Horde/Registry.php +++ b/framework/Core/lib/Horde/Registry.php @@ -2323,9 +2323,6 @@ class Horde_Registry { bindtextdomain($app, $directory); textdomain($app); - - $this->_cachedCharset(0, bind_textdomain_codeset($app, $charset)); - if (!Horde::contentSent()) { header('Content-Type: text/html; charset=' . $charset); } @@ -2366,27 +2363,4 @@ class Horde_Registry ? $trans_lang : $this->nlsconfig['aliases'][$trans_lang]; } - - - /** - * Sets or returns the charset used under certain conditions. - * - * @param integer $index The ID of a cache slot. 0 for the UI charset, 1 - * for the translation charset and 2 for the - * external charset. - * @param string $charset If specified, this charset will be stored in - * the given cache slot. Otherwise the content of - * the specified cache slot will be returned. - */ - protected function _cachedCharset($index, $charset = null) - { - if (is_null($charset)) { - return isset($this->_nlscache['charset'][$index]) - ? $this->_nlscache['charset'][$index] - : null; - } - - $this->_nlscache['charset'][$index] = $charset; - } - }