jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jalka...@apache.org
Subject svn commit: r655358 - in /incubator/jspwiki/trunk: ChangeLog src/com/ecyrd/jspwiki/content/PageRenamer.java
Date Sun, 11 May 2008 19:19:16 GMT
Author: jalkanen
Date: Sun May 11 12:19:16 2008
New Revision: 655358

URL: http://svn.apache.org/viewvc?rev=655358&view=rev
Log:
[JSPWIKI-183] PageRenamer no longer chokes if attachments are turned off.  Reported by Luca
Gilardoni.

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=655358&r1=655357&r2=655358&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun May 11 12:19:16 2008
@@ -15,6 +15,9 @@
         * [JSPWIKI-224] TranslatorReader now is just a proxy to the
         JSPWikiMarkupParser.  It will be finally gone in 3.0.
         
+        * [JSPWIKI-183] PageRenamer no longer chokes if attachments
+        are turned off.  Reported by Luca Gilardoni.
+        
 2008-05-10  Janne Jalkanen <jalkanen@apache.org>
 
         * 2.7.0-svn-21

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java?rev=655358&r1=655357&r2=655358&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/content/PageRenamer.java Sun May 11 12:19:16
2008
@@ -99,8 +99,11 @@
         
         engine.getPageManager().getProvider().movePage( renameFrom, renameTo );
         
-        engine.getAttachmentManager().getCurrentProvider().moveAttachmentsForPage( renameFrom,
renameTo );
-
+        if( engine.getAttachmentManager().attachmentsEnabled() )
+        {
+            engine.getAttachmentManager().getCurrentProvider().moveAttachmentsForPage( renameFrom,
renameTo );
+        }
+        
         //
         //  Add a comment to the page notifying what changed.  This adds a new revision
         //  to the repo with no actual change.



Mime
View raw message