Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java
===================================================================
diff -u -r4161978f8d7ac38d8de94e68128ae300b0892e9d -rfbaed90461a821c04884823a4c5791176a951c71
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java	(.../WikiPageDAO.java)	(revision 4161978f8d7ac38d8de94e68128ae300b0892e9d)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dao/hibernate/WikiPageDAO.java	(.../WikiPageDAO.java)	(revision fbaed90461a821c04884823a4c5791176a951c71)
@@ -17,9 +17,10 @@
     public static final String GET_BY_SESSION_AND_TITLE = "from tl_lawiki10_wiki_page in class "
 	    + WikiPage.class.getName() + " where wiki_session_uid=? AND title=?";
 
-    public static final String REMOVE_WIKI_REFERENCES = "UPDATE tl_lawiki10_wiki_page_content "
-	    + "SET body=REPLACE(body,?,?) WHERE editor IS NULL";
-    
+    public static final String REMOVE_WIKI_REFERENCES = "UPDATE tl_lawiki10_wiki_page_content AS content "
+	    + "JOIN tl_lawiki10_wiki_page AS page ON content.wiki_page_uid=page.uid "
+	    + "SET content.body=REPLACE(content.body,?,?) WHERE content.editor IS NULL AND page.wiki_uid=?";
+
     public static final String CHANGE_WIKI_JAVASCRIPT_METHOD = "javascript:changeWikiPage('?')";
 
     public void saveOrUpdate(WikiPage wikiPage) {
@@ -59,6 +60,7 @@
 	SQLQuery query = this.getSession().createSQLQuery(REMOVE_WIKI_REFERENCES);
 	query.setString(0, codeToReplace);
 	query.setString(1, replacementCode);
+	query.setLong(2, removedWikiPage.getParentWiki().getUid());
 	
 	super.delete(object);
 	query.executeUpdate();