Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/gallery.dialog.js b/lib/gallery.dialog.js
index 3587108c..6ec8c634 100644
--- a/lib/gallery.dialog.js
+++ b/lib/gallery.dialog.js
@@ -40,6 +40,7 @@
            $(".ui-dialog-titlebar").remove();
          } else if ($("#g-dialog h1").length) {
            $("#g-dialog").dialog('option', 'title', $("#g-dialog h1:eq(0)").html());
+	   $("#g-dialog h1:eq(0)").hide();
          } else if ($("#g-dialog fieldset legend").length) {
            $("#g-dialog").dialog('option', 'title', $("#g-dialog fieldset legend:eq(0)").html());
          }
@@ -114,7 +115,8 @@
          },
          success: function(data) {
            if (data.form) {
-             $("#g-dialog form").replaceWith(data.form);
+             var formData = unescape(data.form);
+             $("#g-dialog form").replaceWith(formData);
              $("#g-dialog form :submit").removeClass("ui-state-disabled")
                .attr("disabled", null);
              self._ajaxify_dialog();