From d6284b4d22d1e6912b01228b7d2a63e9fecbc5fb Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Wed, 02 Nov 2011 11:13:42 -0400
Subject: [PATCH] check-in 3.4.6 (without moxieplayer due to a content-spoofing vulnerability)

---
 program/js/googiespell.js |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/program/js/googiespell.js b/program/js/googiespell.js
index 6101fd2..e3fdf7d 100644
--- a/program/js/googiespell.js
+++ b/program/js/googiespell.js
@@ -167,9 +167,9 @@
     this.extra_menu_items.push([name, call_back_fn, checker]);
 };
 
-this.appendCustomMenuBuilder = function(eval, builder)
+this.appendCustomMenuBuilder = function(eval_fn, builder)
 {
-    this.custom_menu_builder.push([eval, builder]);
+    this.custom_menu_builder.push([eval_fn, builder]);
 };
 
 this.setFocus = function()
@@ -211,7 +211,7 @@
 
 this.escapeSpecial = function(val)
 {
-    return val.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+    return val ? val.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;") : '';
 };
 
 this.createXMLReq = function (text)
@@ -462,7 +462,7 @@
     var changed = false;
     for (var k=0; k<this.custom_menu_builder.length; k++) {
         var eb = this.custom_menu_builder[k];
-        if(eb[0]((this.results[id]))){
+        if (eb[0](this.results[id])) {
             changed = eb[1](this, list, elm);
             break;
         }

--
Gitblit v1.9.1