From c60fbe3a3b3616ad60747b8c07bc84f53823e2b9 Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Wed, 15 Jul 2009 23:08:27 -0400
Subject: [PATCH] fix Nls config usage

---
 framework/Core/lib/Horde.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index 47f4c59a9..44a8997f4 100644
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -1681,11 +1681,11 @@ HTML;
      */
     static public function stripAccessKey($label)
     {
-        if (!isset($GLOBALS['nls'])) {
+        if (!isset(Horde_Nls::$config['multibyte'])) {
             self::loadConfiguration('nls.php', null, 'horde');
         }
-        $multibyte = isset($GLOBALS['nls']['multibyte'][Horde_Nls::getCharset(true)]);
 
+        $multibyte = isset(Horde_Nls::$config['multibyte'][Horde_Nls::getCharset(true)]);
         return preg_replace('/_([A-Za-z])/',
                             $multibyte && preg_match('/[\x80-\xff]/', $label) ? '' : '\1',
                             $label);
-- 
2.11.0