From fee447fae8b9b19b88985674b6a93eb73acafdf7 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 30 Aug 2014 07:22:14 -0400
Subject: [PATCH] bug in functions.js: Cannot read property 'replace' of
 undefined

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog       |  1 +
 js/functions.js | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aec5d07dce..8f96d219df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog
 - bug       server_privileges.js: cannot read property
 - bug #4527 Importing ODS files with column names having trailing spaces fails
 - bug #4413 Navigation Error in Nav Tree for Search Results Past the First Page
+- bug       functions.js: Cannot read property 'replace' of undefined
 
 4.2.7.1 (2014-08-17)
 - bug #4501 [security] XSS in table browse page
diff --git a/js/functions.js b/js/functions.js
index bcdead8e17..4e288ea545 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3835,12 +3835,16 @@ function PMA_clearSelection() {
  * HTML escaping
  */
 function escapeHtml(unsafe) {
-    return unsafe
-        .replace(/&/g, "&amp;")
-        .replace(/</g, "&lt;")
-        .replace(/>/g, "&gt;")
-        .replace(/"/g, "&quot;")
-        .replace(/'/g, "&#039;");
+    if (typeof(unsafe) != 'undefined') {
+        return unsafe
+            .replace(/&/g, "&amp;")
+            .replace(/</g, "&lt;")
+            .replace(/>/g, "&gt;")
+            .replace(/"/g, "&quot;")
+            .replace(/'/g, "&#039;");
+    } else {
+        return false;
+    }
 }
 
 /**