Author: vmassol
Date: 2007-09-28 11:01:03 +0200 (Fri, 28 Sep 2007)
New Revision: 5123

Modified:
   
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/delete.vm
Log:
XWIKI-1770: Add new searchDocuments() API that accepts named HQL queries
XWIKI-1768: Cannot delete Space with a simple quote in its name

Merged from trunk (rev 5094)

Modified: 
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/delete.vm
===================================================================
--- 
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/delete.vm
        2007-09-28 08:58:10 UTC (rev 5122)
+++ 
xwiki-platform/web/branches/xwiki-web-1.1/standard/src/main/webapp/skins/albatross/delete.vm
        2007-09-28 09:01:03 UTC (rev 5123)
@@ -8,7 +8,7 @@
   <div id="xwikimessage">$message</div>
 #end
 #set($links=$doc.getBacklinks())
-#set($orphans = $xwiki.searchDocuments(" where doc.fullName <> 
'${doc.fullName}as' and (doc.parent = '${doc.fullName}' or (doc.parent = 
'${doc.name}' and doc.web = '${doc.web}'))"))
+#set($orphans = $xwiki.searchDocuments(" where doc.fullName <> ? and 
(doc.parent = ? or (doc.parent = ? and doc.web = ?))", ["${doc.fullName}as", 
${doc.fullName}, ${doc.name}, ${doc.web}]))
 #if($request.xredirect)
   #set($redirectparam = "&amp;xredirect=$request.xredirect")
 #end

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to