Removing some code duplication.

cakephp · Aug 11, 2010 · 052c817 · 052c817
1 parent 22fbc24
commit 052c817
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
@@ -667,12 +667,9 @@ public function __get($name) {
  * @return void
  */
 	public function loadHelpers() {
-		foreach ($this->helpers as $i => $helper) {
-			$options = array();
-			if (!is_int($i)) {
-				list($options, $helper) = array($helper, $i);
-			}
-			$this->Helpers->load($helper, $options, true);
+		$helpers = HelperCollection::normalizeObjectArray($this->helpers);
+		foreach ($helpers as $name => $properties) {
+			$this->Helpers->load($properties['class'], $properties['settings'], true);
 		}
 	}