Refactoring to remove some duplication.

cakephp · Nov 10, 2010 · 7ad4068 · 7ad4068
1 parent 1cf5e72
commit 7ad4068
Showing 1 changed file with 6 additions and 7 deletions.
diff --git 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']);