Fix some variable names and undefined variable/index warnings

diff --git a/framework/Core/lib/Horde/Core/Factory/ThemesCache.php b/framework/Core/lib/Horde/Core/Factory/ThemesCache.php
index f1b0e87..e9a8940 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/ThemesCache.php
+++ b/framework/Core/lib/Horde/Core/Factory/ThemesCache.php
@@ -66,6 +66,8 @@ class Horde_Core_Factory_ThemesCache
         if (!isset($this->_instances[$sig])) {
             if (!empty($GLOBALS['conf']['cachethemes'])) {
                 $cache = $this->_injector->getInstance('Horde_Cache');
+            } else {
+                $cache = null;
             }
 
             if (!$cache || ($cache instanceof Horde_Cache_Null)) {

diff --git a/framework/Core/lib/Horde/Themes/Cache.php b/framework/Core/lib/Horde/Themes/Cache.php
index 0473e5c..fc12886 100644 (file)
--- a/framework/Core/lib/Horde/Themes/Cache.php
+++ b/framework/Core/lib/Horde/Themes/Cache.php
@@ -219,7 +219,8 @@ class Horde_Themes_Cache implements Serializable
     public function getCacheId()
     {
         if (!isset($this->_cacheid)) {
-            switch ($GLOBALS['config']['themescacheparams']['check']) {
+            $check = isset($GLOBALS['conf']['cachethemesparams']['check']) ? $GLOBALS['conf']['cachethemesparams']['check'] : null;
+            switch ($check) {
             case 'appversion':
             default:
                 $id = array($GLOBALS['registry']->getVersion($this->_app));