<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -604,7 +604,7 @@ Ajax.InPlaceEditor = Class.create({
     this.triggerCallback('onEnterHover');
   },
   getText: function() {
-    return this.element.innerHTML;
+    return this.element.innerHTML.unescapeHTML();
   },
   handleAJAXFailure: function(transport) {
     this.triggerCallback('onFailure', transport);</diff>
      <filename>src/controls.js</filename>
    </modified>
    <modified>
      <diff>@@ -24,6 +24,8 @@
 &lt;p id=&quot;newtbe&quot;&gt;New to be edited&lt;/p&gt;
 &lt;p id=&quot;newtbe_external&quot;&gt;External control for it&lt;/p&gt;
 
+&lt;p id=&quot;contains_ampersand&quot;&gt;Me &amp; Myself&lt;/p&gt;
+
 &lt;div id=&quot;tobeeditedMultiLine&quot;&gt;First line&lt;br/&gt;
 Second line&lt;br/&gt;
 Third line&lt;/div&gt;
@@ -875,6 +877,14 @@ Third line&lt;/div&gt;
       assertEqual('#ff0000', ipe.options.highlightColor, 'Highlight color was not migrated');
       assertEqual('#00ff00', ipe.options.highlightEndColor, 'Highlight end color was not migrated');
       ipe.dispose();
+    }},
+
+
+    testShouldShowAmpersandsProperly: function() {with(this) {
+      var ipe = new Ajax.InPlaceEditor('contains_ampersand', '', {});
+      Event.simulateMouse('contains_ampersand', 'click');
+      assertEqual(&quot;Me &amp; Myself&quot;, $$('form#contains_ampersand-inplaceeditor input.editor_field')[0].value);
+      ipe.dispose();
     }}
     // FIXME: add AC w/o key conflicts?
     // FIXME: doc w/ full details on what's new, what's changed, etc. + deprecation layer info.</diff>
      <filename>test/unit/ajax_inplaceeditor_test.html</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>8daa8d946527e1bc7030c69ca7677df12c602910</id>
    </parent>
  </parents>
  <author>
    <name>Sean Kirby</name>
    <email>sskirby@Resartus.(none)</email>
  </author>
  <url>http://github.com/madrobby/scriptaculous/commit/f13b5c05fdc149558f9be6f9096d43c46abfd084</url>
  <id>f13b5c05fdc149558f9be6f9096d43c46abfd084</id>
  <committed-date>2008-09-22T10:35:54-07:00</committed-date>
  <authored-date>2008-09-22T10:35:54-07:00</authored-date>
  <message>InPlaceEditor will correctly show text with ampersands upon edit (no more &amp;amp;)</message>
  <tree>58b91e07e1fcfac9f3c07a8a085f333bd5c1658f</tree>
  <committer>
    <name>Sean Kirby</name>
    <email>sskirby@Resartus.(none)</email>
  </committer>
</commit>
