From d5b48c1ec29c680ec22bebf3e40f2c5f451f1251 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Thu, 29 May 2014 20:04:34 -0400
Subject: [PATCH] FIX: i resolved that merge conflict badly. category
 notification settings dropdown was never showing.

---
 .../javascripts/discourse/routes/discovery_route_builders.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/routes/discovery_route_builders.js b/app/assets/javascripts/discourse/routes/discovery_route_builders.js
index 5f450a0133..d85bb4fd08 100644
--- a/app/assets/javascripts/discourse/routes/discovery_route_builders.js
+++ b/app/assets/javascripts/discourse/routes/discovery_route_builders.js
@@ -107,8 +107,8 @@ function buildCategoryRoute(filter, params) {
       var opts = { category: model, filterMode: filterMode };
       opts.noSubcategories = params && params.no_subcategories;
       opts.canEditCategory = Discourse.User.currentProp('staff');
-      this.controllerFor('navigation/category').setProperties(opts);
       opts.canChangeCategoryNotificationLevel = Discourse.User.current();
+      this.controllerFor('navigation/category').setProperties(opts);
 
       return Discourse.TopicList.list(listFilter, params).then(function(list) {
         var tracking = Discourse.TopicTrackingState.current();