From: Simon Cozens Date: Fri, 26 Mar 2004 10:11:40 +0000 (+0000) Subject: Crap! Forgot to check this in before release! X-Git-Tag: 2.10~267 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=21f7227de6443b25f6a5a71ce6698d2b73350bc5;p=maypole.git Crap! Forgot to check this in before release! git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@95 48953598-375a-da11-a14b-00016c27c3ee --- diff --git a/lib/Maypole/Model/CDBI.pm b/lib/Maypole/Model/CDBI.pm index 052ebc9..8b753df 100644 --- a/lib/Maypole/Model/CDBI.pm +++ b/lib/Maypole/Model/CDBI.pm @@ -90,8 +90,8 @@ sub search :Exported { $r->template("list"); if (!%values) { return $self->list($r) } - $self = $self->do_pager($r); my $order = $self->order($r); + $self = $self->do_pager($r); $r->objects([ $self->search_where(\%values), ($order ? { order => $order } : ()) ]); @@ -117,8 +117,8 @@ sub order { sub list :Exported { my ($self, $r) = @_; - $self = $self->do_pager($r); my $order = $self->order($r); + $self = $self->do_pager($r); if ($order) { $r->objects([ $self->retrieve_all_sorted_by( $order )]); } else {