From 68d0d39ab7a07306acdc9d863aa68b77e38bc531 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 2 Feb 2018 16:11:28 -0500
Subject: [PATCH] FIX: Order the homepage box in the same order as the top menu

This is required because "no interface" is the same as showing
the first entry. But when the top menu has changed the first
entry is no longer the same, so it shows the wrong default.
---
 .../controllers/preferences/interface.js.es6       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
index fd688471bc9..9eb2960b836 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
@@ -57,16 +57,24 @@ export default Ember.Controller.extend(PreferencesTabController, {
   },
 
   homeChanged() {
-    const siteHome = Discourse.SiteSettings.top_menu.split("|")[0].split(",")[0];
+    const siteHome = this.siteSettings.top_menu.split("|")[0].split(",")[0];
     const userHome = USER_HOMES[this.get('model.user_option.homepage_id')];
+
     setDefaultHomepage(userHome || siteHome);
   },
 
   @computed()
   userSelectableHome() {
-    return _.map(USER_HOMES, (name, num) => {
-      return {name: I18n.t('filters.' + name + '.title'), value: Number(num)};
+    let homeValues = _.invert(USER_HOMES);
+
+    let result = [];
+    this.siteSettings.top_menu.split('|').forEach(m => {
+      let id = homeValues[m];
+      if (id) {
+        result.push({ name: I18n.t(`filters.${m}.title`), value: Number(id) });
+      }
     });
+    return result;
   },
 
   actions: {