Skip to content

Commit

Permalink
Reformatting paging params.
Browse files Browse the repository at this point in the history
Removing defaults from the paging params as they are no longer being used.
  • Loading branch information
markstory committed Dec 19, 2010
1 parent ef84d86 commit 833bdbc
Show file tree
Hide file tree
Showing 2 changed files with 301 additions and 95 deletions.
4 changes: 1 addition & 3 deletions cake/libs/view/helpers/paginator.php
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,7 @@ public function link($title, $url = array(), $options = array()) {
*/
public function url($options = array(), $asArray = false, $model = null) {
$paging = $this->params($model);
$url = array_merge(array_filter(Set::diff(array_merge(
$paging['defaults'], $paging['options']), $paging['defaults'])), $options
);
$url = array_merge(array_filter($paging['options']), $options);

if (isset($url['order'])) {
$sort = $direction = null;
Expand Down
Loading

0 comments on commit 833bdbc

Please sign in to comment.