[Jboss-svn-commits] JBL Code SVN: r1224 - qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki

[<jbo...@li...>]

Author: dam...@jb...
Date: 2005-09-27 12:14:21 -0400 (Tue, 27 Sep 2005)
New Revision: 1224

Modified:
   qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java
Log:
MERGED: 1221:1223 trunk forge into qa forge for 1.0.4 release... this is a wiki bug fix.

Modified: qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java
===================================================================
--- qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java	2005-09-27 15:55:35 UTC (rev 1223)
+++ qa/forge/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileDataSource.java	2005-09-27 16:14:21 UTC (rev 1224)
@@ -647,8 +647,10 @@
 					&& (!pageFiles[i].getName().endsWith("-att"))) {
 
 				// do not take dirs from OLD
-				if (!pageFiles[i].getAbsolutePath()
-						.equals(pathToMedia + "/OLD")) {
+				if ((!pageFiles[i].getAbsolutePath()
+						.equals(pathToMedia + "/OLD"))&&(!pageFiles[i].getAbsolutePath()
+								.equals(pathToMedia + "/" + MediaDataSource.mediaTrashName))&&(!pageFiles[i].getAbsolutePath()
+										.equals(pathToMedia + "/" + AttachmentDataSource.attTrashName))) {
 					// get names for subpages
 					getPageNamesFor(directory + "/" + pageFiles[i].getName(),
 							attSet);