From f3d9d1295ab0b72fdf1ef2427b368b9f698a9351 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 23 Oct 2015 12:01:25 -0400
Subject: [PATCH] FIX: Support subfolder URLs for middle clicking search

---
 .../javascripts/discourse/components/header-dropdown.js.es6 | 6 +++---
 app/assets/javascripts/discourse/templates/header.hbs       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/header-dropdown.js.es6 b/app/assets/javascripts/discourse/components/header-dropdown.js.es6
index 447184410..387f7ae8f 100644
--- a/app/assets/javascripts/discourse/components/header-dropdown.js.es6
+++ b/app/assets/javascripts/discourse/components/header-dropdown.js.es6
@@ -4,9 +4,9 @@ export default Ember.Component.extend({
   tagName: 'li',
   classNameBindings: [':header-dropdown-toggle', 'active'],
 
-  @computed('showUser')
-  href(showUser) {
-    return showUser ? this.currentUser.get('path') : '';
+  @computed('showUser', 'path')
+  href(showUser, path) {
+    return showUser ? this.currentUser.get('path') : Discourse.getURL(path);
   },
 
   active: Ember.computed.alias('toggleVisible'),
diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs
index 87a1d1964..28da2d800 100644
--- a/app/assets/javascripts/discourse/templates/header.hbs
+++ b/app/assets/javascripts/discourse/templates/header.hbs
@@ -22,7 +22,7 @@
                            mobileAction="fullPageSearch"
                            loginAction="showLogin"
                            title="search.title"
-                           href="/search"}}
+                           path="/search"}}
         {{/header-dropdown}}
 
         {{#header-dropdown iconId="toggle-hamburger-menu"