aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/general_controller.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2011-08-29 13:18:49 +0100
committerSeb Bacon <seb.bacon@gmail.com>2011-08-29 13:18:49 +0100
commit9e6173961d2eefae7417ad2bca06e9168533405b (patch)
tree18c3b8e9237d178e6a20c2412ac473685c9c183f /app/controllers/general_controller.rb
parentb41edc7ae069e6071f7ff7223c1e60cca5e75e8c (diff)
parente8ff6d861faefb76c11475a112002cd1b0095590 (diff)
fix merge
Diffstat (limited to 'app/controllers/general_controller.rb')
-rw-r--r--app/controllers/general_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 40c79cdb8..2d0527d3a 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -139,6 +139,7 @@ class GeneralController < ApplicationController
@sort_postfix = combined.pop
@sortby = @sort_postfix
end
+
if combined.size > 0 && (['bodies', 'requests', 'users', 'all'].include?(combined[-1]))
@variety_postfix = combined.pop
case @variety_postfix