Merge pull request #170 from shadlaws/fix_2022

#2022 - Fix handling of watermark dialog errors.

1 files changed, 0 insertions, 7 deletions

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index e9f4aa03..8fe85165 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -137,13 +137,6 @@
         },
         success: function(data) {
           if (data.html) {
-            if (data.result == "error") {
-              // This is an odd case that arises from the watermarks module.  This is because we
-              // have a fake xhr, and we rawurlencode the results because the JS code that uploads
-              // the file buffers it in an iframe which entitizes the HTML and makes it difficult
-              // for the JS to process.  See ticket #797.
-              data.html = unescape(data.html);
-            }
             $("#g-dialog").html(data.html);
             $("#g-dialog").dialog("option", "position", "center");
             $("#g-dialog form :submit").removeClass("ui-state-disabled")