From c51d26a02dddd3e1054e374980cd287a05780037 Mon Sep 17 00:00:00 2001
From: NGPixel <github@ngpixel.com>
Date: Thu, 20 Jul 2017 21:20:40 -0400
Subject: [PATCH] fix: search results href siteRoot undefined

---
 client/js/components/search.vue | 9 ++++++---
 npm/package-lock.json           | 2 +-
 npm/package.json                | 2 +-
 package.json                    | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/client/js/components/search.vue b/client/js/components/search.vue
index cb6c45f0..5c97ce38 100644
--- a/client/js/components/search.vue
+++ b/client/js/components/search.vue
@@ -10,7 +10,7 @@
           li(v-if='searchres.length === 0')
             a: em {{ $t('search.nomatch') }}
           li(v-for='sres in searchres', v-bind:class='{ "is-active": searchmovekey === "res." + sres.entryPath }')
-            a(v-bind:href='siteRoot + "/" + sres.entryPath') {{ sres.title }}
+            a(v-bind:href='sres.entryPath') {{ sres.title }}
         p.searchresults-label(v-if='searchsuggest.length > 0') {{ $t('search.didyoumean') }}
         ul.searchresults-list(v-if='searchsuggest.length > 0')
           li(v-for='sug in searchsuggest', v-bind:class='{ "is-active": searchmovekey === "sug." + sug }')
@@ -39,7 +39,10 @@ export default {
         self.searchactive = true
         self.searchload++
         socket.emit('search', { terms: val }, (data) => {
-          self.searchres = data.match
+          self.searchres = self._.map(data.match, m => {
+            m.entryPath = `${siteRoot}/${m.entryPath}`
+            return m
+          })
           self.searchsuggest = data.suggest
           self.searchmovearr = self._.concat([], self.searchres, self.searchsuggest)
           if (self.searchload > 0) { self.searchload-- }
@@ -74,7 +77,7 @@ export default {
       let i = this.searchmoveidx - 1
 
       if (this.searchmovearr[i]) {
-        window.location.assign(siteRoot + '/' + this.searchmovearr[i].entryPath)
+        window.location.assign(this.searchmovearr[i].entryPath)
       } else {
         this.searchq = this.searchmovearr[i]
       }
diff --git a/npm/package-lock.json b/npm/package-lock.json
index 824f1497..e23c24d1 100644
--- a/npm/package-lock.json
+++ b/npm/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "wiki.js",
-  "version": "1.0.0-beta.13.1",
+  "version": "1.0.0-beta.14.1",
   "lockfileVersion": 1,
   "dependencies": {
     "amp": {
diff --git a/npm/package.json b/npm/package.json
index 5b74e10f..76ee5344 100644
--- a/npm/package.json
+++ b/npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wiki.js",
-  "version": "1.0.0-beta.13.2",
+  "version": "1.0.0-beta.14.1",
   "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
   "main": "install.js",
   "scripts": {
diff --git a/package.json b/package.json
index 8cc9eca6..f111dec0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wiki",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.14",
   "description": "A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown",
   "main": "server.js",
   "scripts": {