Skip to content
Permalink
Browse files

Keeping code dry in HtmlHelper::getCrumbs/getCrumbList

  • Loading branch information...
tigrang committed Feb 21, 2012
1 parent f138c73 commit 95ba5f45a5553d514b9ab42914b5ce00a485b946
Showing with 26 additions and 28 deletions.
  1. +26 −28 lib/Cake/View/Helper/HtmlHelper.php
@@ -684,21 +684,8 @@ public function style($data, $oneline = true) {
public function getCrumbs($separator = '»', $startText = false) {
if (!empty($this->_crumbs)) {
$out = array();
if ($startText) {
if (!is_array($startText)) {
$startText = array(
'url' => '/',
'text' => $startText
);
}
$startText += array('url' => '/', 'text' => __('Home'));
list($url, $text) = array($startText['url'], $startText['text']);
unset($startText['url'], $startText['text']);
$out[] = $this->link($text, $url, $startText);
}
foreach ($this->_crumbs as $crumb) {
$crumbs = $this->_prepareCrumbs($startText);
foreach ($crumbs as $crumb) {
if (!empty($crumb[1])) {
$out[] = $this->link($crumb[0], $crumb[1], $crumb[2]);
} else {
@@ -727,19 +714,7 @@ public function getCrumbs($separator = '»', $startText = false) {
public function getCrumbList($options = array(), $startText = false) {
if (!empty($this->_crumbs)) {
$result = '';
$crumbs = $this->_crumbs;
if ($startText) {
if (!is_array($startText)) {
$startText = array(
'url' => '/',
'text' => $startText
);
}
$startText += array('url' => '/', 'text' => __('Home'));
list($url, $text) = array($startText['url'], $startText['text']);
unset($startText['url'], $startText['text']);
array_unshift($crumbs, array($text, $url, $startText));
}
$crumbs = $this->_prepareCrumbs($startText);
$crumbCount = count($crumbs);
$ulOptions = $options;
foreach ($crumbs as $which => $crumb) {
@@ -762,6 +737,29 @@ public function getCrumbList($options = array(), $startText = false) {
}
}
/**
* Prepends startText to crumbs array if set
*
* @param $startText
* @return array Crumb list including startText (if provided)
*/
protected function _prepareCrumbs($startText) {
$crumbs = $this->_crumbs;
if ($startText) {
if (!is_array($startText)) {
$startText = array(
'url' => '/',
'text' => $startText
);
}
$startText += array('url' => '/', 'text' => __('Home'));
list($url, $text) = array($startText['url'], $startText['text']);
unset($startText['url'], $startText['text']);
array_unshift($crumbs, array($text, $url, $startText));
}
return $crumbs;
}
/**
* Creates a formatted IMG element.
*

0 comments on commit 95ba5f4

Please sign in to comment.
You can’t perform that action at this time.