Author: ajaquith
Date: Mon Oct 6 10:11:29 2008
New Revision: 702204
URL: http://svn.apache.org/viewvc?rev=702204&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 701873 (again).
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiContext.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditTemplate.jsp
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=702204&r1=702203&r2=702204&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
Mon Oct 6 10:11:29 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "3";
+ public static final String BUILD = "17";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiContext.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiContext.java?rev=702204&r1=702203&r2=702204&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiContext.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiContext.java
Mon Oct 6 10:11:29 2008
@@ -484,6 +484,7 @@
// No need to deep clone these
copy.m_engine = m_engine;
+
copy.m_template = m_template;
copy.m_variableMap =
(HashMap<String,Object>)m_variableMap.clone();
copy.m_request = m_request;
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditTemplate.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditTemplate.jsp?rev=702204&r1=702203&r2=702204&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditTemplate.jsp
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/EditTemplate.jsp
Mon Oct 6 10:11:29 2008
@@ -25,10 +25,7 @@
<wiki:Include page="commonheader.jsp"/>
</head>
-<body
- <wiki:CheckRequestContext
context="edit">class="edit"</wiki:CheckRequestContext>
- <wiki:CheckRequestContext
context="comment">class="comment"</wiki:CheckRequestContext>
->
+<body <wiki:CheckRequestContext
context='edit'>class="edit"</wiki:CheckRequestContext><wiki:CheckRequestContext
context='comment'>class="comment"</wiki:CheckRequestContext> >
<div id="wikibody" class="${prefs.Orientation}">
