From 7ad406808584e181d8db5d9c14b936dea796ee9d Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 9 Nov 2010 22:27:36 -0500
Subject: [PATCH] Refactoring to remove some duplication.

---
 cake/libs/view/view.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 10b3c686ccf..819830a4db8 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -334,18 +334,17 @@ public function element($name, $params = array(), $callbacks = false) {
 		}
 
 		if (isset($params['cache'])) {
+			$keys = array_merge(array($plugin, $name), array_keys($params));
+			$caching = array(
+				'config' => $this->elementCache,
+				'key' => implode('_', $keys)
+			);
 			if (is_array($params['cache'])) {
 				$defaults = array(
 					'config' => $this->elementCache,
-					'key' => $plugin . '_' . $name,
+					'key' => $caching['key']
 				);
 				$caching = array_merge($defaults, $params['cache']);
-			} else {
-				$keys = array_merge(array($plugin, $name), array_keys($params));
-				$caching = array(
-					'config' => $this->elementCache,
-					'key' => implode('_', $keys)
-				);
 			}
 			$key = 'element_' . $caching['key'];
 			$contents = Cache::read($key, $caching['config']);