From 7a54637d1c22057825edcb28d9f0804ea6b3ef2f Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 23 Nov 2010 15:24:02 -0700 Subject: [PATCH] No more build --- framework/Core/lib/Horde/Themes/Css.php | 8 ++++---- framework/Core/lib/Horde/Themes/Element.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/Core/lib/Horde/Themes/Css.php b/framework/Core/lib/Horde/Themes/Css.php index b027996b3..7600ac37b 100644 --- a/framework/Core/lib/Horde/Themes/Css.php +++ b/framework/Core/lib/Horde/Themes/Css.php @@ -191,16 +191,16 @@ class Horde_Themes_Css ? null : $opts['sub']; - $build = $GLOBALS['injector']->getInstance('Horde_Core_Factory_ThemesCache')->create($curr_app, $theme); - $this->_cacheid = $build->getCacheId(); + $cache = $GLOBALS['injector']->getInstance('Horde_Core_Factory_ThemesCache')->create($curr_app, $theme); + $this->_cacheid = $cache->getCacheId(); foreach ($css_list as $css_name) { if (empty($opts['subonly'])) { - $css_out = array_merge($css_out, array_reverse($build->getAll($css_name, $mask))); + $css_out = array_merge($css_out, array_reverse($cache->getAll($css_name, $mask))); } if ($sub) { - $css_out = array_merge($css_out, array_reverse($build->getAll($sub . '/' . $css_name, $mask))); + $css_out = array_merge($css_out, array_reverse($cache->getAll($sub . '/' . $css_name, $mask))); } } diff --git a/framework/Core/lib/Horde/Themes/Element.php b/framework/Core/lib/Horde/Themes/Element.php index e60bee041..3f0d78782 100644 --- a/framework/Core/lib/Horde/Themes/Element.php +++ b/framework/Core/lib/Horde/Themes/Element.php @@ -121,12 +121,12 @@ class Horde_Themes_Element 'uri' => $registry->get('themesuri', $this->app) . '/' . $theme . '/' . $this->_dirname ); } else { - $build = $GLOBALS['injector']->getInstance('Horde_Core_Factory_ThemesCache')->create($this->app, $theme); + $cache = $GLOBALS['injector']->getInstance('Horde_Core_Factory_ThemesCache')->create($this->app, $theme); $mask = empty($this->_opts['nohorde']) ? 0 : Horde_Themes_Cache::APP_DEFAULT | Horde_Themes_Cache::APP_THEME; - $this->_data = $build->get($this->_dirname . '/' . $this->_name, $mask); + $this->_data = $cache->get($this->_dirname . '/' . $this->_name, $mask); } return $this->_data[$name]; -- 2.11.0