From 04b0b9f7f36cb75ebc35d1ce0ec607494b67242e Mon Sep 17 00:00:00 2001
From: Trey Davis <trey@pogoseat.com>
Date: Mon, 9 Mar 2015 22:46:14 -0700
Subject: [PATCH] Ensure err.stack exists before calling indexOf

---
 src/kibana/components/notify/_notifier.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/kibana/components/notify/_notifier.js b/src/kibana/components/notify/_notifier.js
index 35d750efd0dd..e8c7ed00658a 100644
--- a/src/kibana/components/notify/_notifier.js
+++ b/src/kibana/components/notify/_notifier.js
@@ -87,6 +87,14 @@ define(function (require) {
     return rtn;
   }
 
+  // browsers format Error.stack differently; always include message
+  function formatStack(err) {
+    if (err.stack && !~err.stack.indexOf(err.message)) {
+      return 'Error: ' + err.message + '\n' + err.stack;
+    }
+    return err.stack;
+  }
+
   /**
    * Functionality to check that
    */
@@ -187,7 +195,7 @@ define(function (require) {
 
     var html = fatalToastTemplate({
       msg: formatMsg(err, this.from),
-      stack: err.stack
+      stack: formatStack(err)
     });
 
     var $container = $('#fatal-splash-screen');
@@ -217,7 +225,7 @@ define(function (require) {
       title: 'Error',
       lifetime: Infinity,
       actions: ['report', 'accept'],
-      stack: err.stack.indexOf(err.message) > -1 ? err.stack : (err.message + err.stack)
+      stack: formatStack(err)
     }, cb);
   };