svn commit: r683812 - /incubator/jspwiki/trunk/src/webdocs/Wiki.jsp

[ajaquith]

Author: ajaquith
Date: Thu Aug  7 20:01:45 2008
New Revision: 683812

URL: http://svn.apache.org/viewvc?rev=683812&view=rev
Log:
Rolled back erroneous commit from Stripes branch... again.

Modified:
    incubator/jspwiki/trunk/src/webdocs/Wiki.jsp

Modified: incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Wiki.jsp?rev=683812&r1=683811&r2=683812&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Wiki.jsp Thu Aug  7 20:01:45 2008
@@ -15,11 +15,11 @@
     if(!wikiContext.hasAccess( response )) return;
     String pagereq = wikiContext.getName();
 
-    // Redirect if the request was for a 'special page'
-    String redirect = wiki.getWikiActionBeanFactory().getSpecialPageReference( 
pagereq );
+    // Redirect if request was for a special page
+    String redirect = wiki.getRedirectURL( wikiContext );
     if( redirect != null )
     {
-        response.sendRedirect( wikiContext.getViewURL( redirect ) );
+        response.sendRedirect( redirect );
         return;
     }
     
@@ -30,7 +30,6 @@
         w.enterState("Generating VIEW response for "+wikiContext.getPage(),60);
     
         // Set the content type and include the response content
-        wikiContext.setVariable( "contentTemplate", "PageContent.jsp" );
         response.setContentType("text/html; 
charset="+wiki.getContentEncoding() );
         String contentPage = wiki.getTemplateManager().findJSP( pageContext,
                                                                 
wikiContext.getTemplate(),