Fix failing test & simplify code.

cakephp · Nov 17, 2012 · a3ddff4 · a3ddff4
1 parent c752b75
commit a3ddff4
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 38 deletions.
diff --git a/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
@@ -1856,27 +1856,31 @@ public function testCrumbListFirstLink() {
  * @return void
  */
 	public function testCrumbListBootstrapStyle() {
-		$this->Html->addCrumb('Home', '/', array('class'=>'home'));
+		$this->Html->addCrumb('Home', '/', array('class' => 'home'));
 		$this->Html->addCrumb('Library', '/lib');
 		$this->Html->addCrumb('Data');
-		$result = $this->Html->getCrumbList(
+		$result = $this->Html->getCrumbList(array(
-			array('class' => 'breadcrumb', 'separator' => '<span class="divider">/</span>', 'firstClass' => false, 'lastClass' => 'active')
+			'class' => 'breadcrumb',
-		);
+			'separator' => '<span class="divider">-</span>',
+			'firstClass' => false,
+			'lastClass' => 'active'
+		));
+		debug($result);
 		$this->assertTags(
 			$result,
 			array(
 				array('ul' => array('class' => 'breadcrumb')),
 				'<li',
-				array('a' => array('href' => '/')), 'Home', '/a',
+				array('a' => array('class' => 'home', 'href' => '/')), 'Home', '/a',
-				array('span' =>array('class' => 'divider')), 'preg:/\//', '/span',
+				array('span' =>array('class' => 'divider')), '-', '/span',
 				'/li',
 				'<li',
 				array('a' => array('href' => '/lib')), 'Library', '/a',
-				array('span' => array('class' => 'divider')), 'preg:/\//', '/span',
+				array('span' => array('class' => 'divider')), '-', '/span',
 				'/li',
 				array('li' => array('class' => 'active')), 'Data', '/li',
 				'/ul'
-			), true
+			)
 		);
 	}
 
@@ -1996,4 +2000,4 @@ public function testParseAttributeCompact() {
 		$this->assertEquals('', $helper->parseAttributes(array('require' => false)));
 	}
 
-}
+}
diff --git a/lib/Cake/View/Helper/HtmlHelper.php b/lib/Cake/View/Helper/HtmlHelper.php
@@ -699,37 +699,34 @@ public function getCrumbList($options = array(), $startText = false) {
 		$firstClass = $options['firstClass'];
 		$lastClass = $options['lastClass'];
 		$separator = $options['separator'];
-		unset($options['firstClass'], $options['lastClass'], $options['separator']);		
+		unset($options['firstClass'], $options['lastClass'], $options['separator']);
+
 		$crumbs = $this->_prepareCrumbs($startText);
-		if (!empty($crumbs)) {
+		if (empty($crumbs)) {
-			$result = '';
+			return '';
-			$crumbCount = count($crumbs);
+		}
-			$ulOptions = $options;
+
-			foreach ($crumbs as $which => $crumb) {
+		$result = '';
-				$options = array();
+		$crumbCount = count($crumbs);
-				if (empty($crumb[1])) {
+		$ulOptions = $options;
-					$elementContent = $crumb[0];
+		foreach ($crumbs as $which => $crumb) {
-				} else {
+			$options = array();
-					$elementContent = $this->link($crumb[0], $crumb[1], $crumb[2]);
+			if (empty($crumb[1])) {
-				}
+				$elementContent = $crumb[0];
-				if (!$which) {
+			} else {
-					if ($firstClass !== false) {
+				$elementContent = $this->link($crumb[0], $crumb[1], $crumb[2]);
-						$options['class'] = $firstClass;
-					}
-				} elseif ($which == $crumbCount - 1) {
-					if ($lastClass !== false) {
-						$options['class'] = $lastClass;
-					}
-				}
-				if (!empty($separator) && ($crumbCount - $which >= 2)) {
-					$elementContent .= $separator;
-				}
-				$result .= $this->tag('li', $elementContent, $options);
 			}
-			return $this->tag('ul', $result, $ulOptions);
+			if (!$which && $firstClass !== false) {
-		} else {
+				$options['class'] = $firstClass;
-			return null;
+			} elseif ($which == $crumbCount - 1 && $lastClass !== false) {
+				$options['class'] = $lastClass;
+			}
+			if (!empty($separator) && ($crumbCount - $which >= 2)) {
+				$elementContent .= $separator;
+			}
+			$result .= $this->tag('li', $elementContent, $options);
 		}
+		return $this->tag('ul', $result, $ulOptions);
 	}
 
 /**
@@ -1229,4 +1226,4 @@ public function loadConfig($configFile, $path = null) {
 		return $configs;
 	}
 
-}
+}