- if ( $order = $r->query->{order} and $ok_columns{$order} ) {
- $order .= ( $r->query->{o2} eq "desc" && " DESC" );
- }
- $order;
+ my $q = $r->query;
+ my $order = $q->{order};
+ return unless $order and $ok_columns{$order};
+ $order .= ' DESC' if $q->{o2} and $q->{o2} eq 'desc';
+ return $order;