aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-01-29 19:13:34 +0000
committerRobin Houston <robin.houston@gmail.com>2012-01-29 19:13:34 +0000
commitbbaa789b6c417300fbdace70ca93d7099c68b718 (patch)
treef15eb4eef728701dceddffe440a609302cac8d8d /app/controllers/application_controller.rb
parentd4c29c07ae46784ea1d564b749fb709c94a913f9 (diff)
parentf6cd280bbfafa2151ededb8280407686fb73e8a7 (diff)
Merge branch 'release/0.5' into wdtk
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 5a295d3e7..1849f23f3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -354,9 +354,7 @@ class ApplicationController < ActionController::Base
@sortby = sortby
# Work out sorting method
- order_pair = order_to_sort_by(@sortby)
- order = order_pair[0]
- ascending = order_pair[1]
+ order, ascending = order_to_sort_by(@sortby)
# Peform the search
@per_page = per_page