From: Chuck Hagenbuch <chuck@horde.org>
Date: Fri, 24 Dec 2010 21:43:09 +0000 (-0500)
Subject: Fix fatal error when a session has timed out
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0e41c4c551c72f8abddbb9c0d3aa8b811f3ec113;p=horde.git

Fix fatal error when a session has timed out
---

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 3c641e754..5b345560a 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -2142,7 +2142,7 @@ class Horde_Registry
      */
     public function getEmailCharset()
     {
-        if ($charset = $GLOBALS['prefs']->getValue('sending_charset')) {
+        if (isset($GLOBALS['prefs']) && ($charset = $GLOBALS['prefs']->getValue('sending_charset'))) {
             return $charset;
         }