fix Nls config usage
authorChuck Hagenbuch <chuck@horde.org>
Thu, 16 Jul 2009 03:08:27 +0000 (23:08 -0400)
committerChuck Hagenbuch <chuck@horde.org>
Thu, 16 Jul 2009 03:08:27 +0000 (23:08 -0400)
framework/Core/lib/Horde.php

index 47f4c59..44a8997 100644 (file)
@@ -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);