Merge pull request #107 from wrooot/master

SPARK-1714 fix saving notes with & (patch by Alexander198961)
igniterealtime · Mar 13, 2016 · 62c3fcd · 62c3fcd
2 parents 64e2472 + fe2a0f9
commit 62c3fcd
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/scratchpad/PrivateNotes.java b/src/java/org/jivesoftware/sparkimpl/plugin/scratchpad/PrivateNotes.java
@@ -46,9 +46,18 @@ public String getNotes() {
     }
 
     public void setNotes(String notes) {
-        this.notes = notes;
+    	if(notes!=null)
+    		{	
+    			this.notes=notes.replaceAll("&","&amp;");
+    		} else {
+    			this.notes=notes;
+    	}
     }
 
+    public void setMyNotes(String notes) {
+    this.notes=notes;
+
+    }
 
     /**
      * Returns the root element name.
@@ -146,6 +155,12 @@ public static PrivateNotes getPrivateNotes() {
             Log.error(e);
         }
 
+        if(notes.getNotes() != null )
+        	{
+        		String note=notes.getNotes().replaceAll("&amp;","&");
+        		notes.setMyNotes(note);
+        	}
+
         return notes;
     }
 }