From c80198624f64b75b3af1a565d2431506b36f2e3f Mon Sep 17 00:00:00 2001
From: Wataru Takase <wataru.takase@kek.jp>
Date: Mon, 6 Feb 2017 10:35:01 +0900
Subject: [PATCH] Fix 5.2 issues

---
 server/proxy/get_suffix_from_path.js | 2 +-
 server/proxy/init_kibana_proxy.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/proxy/get_suffix_from_path.js b/server/proxy/get_suffix_from_path.js
index 71a6a18..a2ff109 100644
--- a/server/proxy/get_suffix_from_path.js
+++ b/server/proxy/get_suffix_from_path.js
@@ -1,6 +1,6 @@
 module.exports = function (path) {
   const suffix = path.split('/')[1];
-  if (['app', 'ui', 'bundles', 'api', 'plugins', 'elasticsearch'].indexOf(suffix) > -1) {
+  if (['app', 'ui', 'bundles', 'api', 'plugins', 'elasticsearch', 'es_admin'].indexOf(suffix) > -1) {
     return null;
   } else {
     return suffix;
diff --git a/server/proxy/init_kibana_proxy.js b/server/proxy/init_kibana_proxy.js
index d2462a2..461101f 100644
--- a/server/proxy/init_kibana_proxy.js
+++ b/server/proxy/init_kibana_proxy.js
@@ -95,7 +95,7 @@ module.exports = function(kbnServer, yarOptions) {
                 const replacedIndex = getKibanaIndexName(kbnServer, request);
                 if (replacedIndex) {
                   const suffix = replacedIndex.slice(kbnServer.config().get('kibana.index').length + 1);
-                  const modifiedPayload = originalPayload.replace(/scope.href/g, 'scope.href.replace("app/kibana", "' + suffix + '/app/kibana")');
+                  const modifiedPayload = originalPayload.replace(/scope.href(:|;)/g, 'scope.href.replace("app/kibana", "' + suffix + '/app/kibana")' + "$1");
                   if (modifiedPayload !== originalPayload) {
                     kbnServer.log(['plugin:own-home', 'debug'], 'Replace the string in commons.bundle.js: "app/kibana" => "' + suffix + '/app/kibana"');
                   } else {