From ed2f7013c993cc7175b85215c4d1668f03a613a6 Mon Sep 17 00:00:00 2001 From: Harold Putman Date: Mon, 1 Oct 2012 14:20:49 -0400 Subject: [PATCH] More Flexible Paginator Zurb foundation expects pagination links wrapped in anchor tags even on the current page. This seems like a safer approach. --- lib/Cake/View/Helper/PaginatorHelper.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Cake/View/Helper/PaginatorHelper.php b/lib/Cake/View/Helper/PaginatorHelper.php index a42b23c6c39..0049bcb741e 100644 --- a/lib/Cake/View/Helper/PaginatorHelper.php +++ b/lib/Cake/View/Helper/PaginatorHelper.php @@ -474,7 +474,7 @@ protected function _pagingLink($which, $title = null, $options = array(), $disab return $this->Html->tag($tag, $this->link($title, $url, array_merge($options, compact('escape'))), compact('class')); } else { unset($options['rel']); - return $this->Html->tag($tag, $this->Html->tag('span', $title, compact('escape')), array_merge($options, compact('class'))); + return $this->Html->tag($tag, ''.h($title).'', array_merge($options, compact('class'))); } } @@ -714,7 +714,7 @@ public function numbers($options = array()) { if ($class) { $currentClass .= ' ' . $class; } - $out .= $this->Html->tag($tag, $this->Html->tag('span', $params['page']), array('class' => $currentClass)); + $out .= $this->Html->tag($tag, ''.$params['page'].'', array('class' => $currentClass)); if ($i != $params['pageCount']) { $out .= $separator; } @@ -747,7 +747,7 @@ public function numbers($options = array()) { if ($class) { $currentClass .= ' ' . $class; } - $out .= $this->Html->tag($tag, $this->Html->tag('span',$i), array('class' => $currentClass)); + $out .= $this->Html->tag($tag, "$i", array('class' => $currentClass)); } else { $out .= $this->Html->tag($tag, $this->link($i, array('page' => $i), $options), compact('class')); }