Fix OC.dialogs.form()

Don't do _too_ much escapeHTML()

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index a690938f38323492593151cddaf49719307136f1..990c3f8bf38b19cedb8bfed7785864174971e681 100644 (file)
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -110,7 +110,7 @@ var OCdialogs = {
 
                var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
                var dialog_id = '#' + dialog_name;
-               var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + escapeHTML(content) + '</div>';
+               var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + content + '</div>';
                if (modal === undefined) { modal = false };
                $('body').append(dialog_div);
                var buttonlist = [{
@@ -205,7 +205,7 @@ var OCdialogs = {
        message:function(content, title, dialog_type, buttons, callback, modal) {
                var dialog_name = 'oc-dialog-' + OCdialogs.dialogs_counter + '-content';
                var dialog_id = '#' + dialog_name;
-               var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + escapeHTML(content) + '</div>';
+               var dialog_div = '<div id="' + dialog_name + '" title="' + escapeHTML(title) + '">' + content + '</div>';
                if (modal === undefined) { modal = false };
                $('body').append(dialog_div);
                var buttonlist = [];
@@ -285,7 +285,7 @@ var OCdialogs = {
                if (callback !== undefined) {
                        var valuelist = [];
                        $(dialog_id + ' input, ' + dialog_id + ' select').each(function(index, element) {
-                               valuelist[index] = { name: $(elem).attr('name'), value: OCdialogs.determineValue(elem) };
+                               valuelist[index] = { name: $(element).attr('name'), value: OCdialogs.determineValue(element) };
                        });
                        $(dialog_id).dialog('close');
                        callback(valuelist);