You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2016/10/01 09:23:10 UTC
jspwiki git commit: 2016-09-16 Harry Metske (metskem@apache.org) *
Fixed JSPWIKI-1033 - Incorrect relative navigations (reported by Niklas
Polke)
Repository: jspwiki
Updated Branches:
refs/heads/JSPWIKI-1033 [created] d8ee0a422
2016-09-16 Harry Metske (metskem@apache.org)
* Fixed JSPWIKI-1033 - Incorrect relative navigations (reported by Niklas Polke)
Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/d8ee0a42
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/d8ee0a42
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/d8ee0a42
Branch: refs/heads/JSPWIKI-1033
Commit: d8ee0a422bf3152153bfcb70e012f761251d8cd8
Parents: fbf0008
Author: Harry Metske <me...@apache.org>
Authored: Sat Oct 1 11:22:33 2016 +0200
Committer: Harry Metske <me...@apache.org>
Committed: Sat Oct 1 11:22:33 2016 +0200
----------------------------------------------------------------------
ChangeLog | 3 +++
jspwiki-war/src/main/java/org/apache/wiki/Release.java | 2 +-
jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/d8ee0a42/ChangeLog
----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 65d175a..bbf45fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2016-09-16 Harry Metske (metskem@apache.org)
+ * Fixed JSPWIKI-1033 - Incorrect relative navigations (reported by Niklas Polke)
+
2016-09-16 David Vittor (dvittor@apache.org)
* Test commit to our new git repo.
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/d8ee0a42/jspwiki-war/src/main/java/org/apache/wiki/Release.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/Release.java b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
index 246f335..850d240 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/Release.java
@@ -72,7 +72,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "14";
+ public static final String BUILD = "15";
/**
* This is the generic version string you should use when printing out the version. It is of
http://git-wip-us.apache.org/repos/asf/jspwiki/blob/d8ee0a42/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
----------------------------------------------------------------------
diff --git a/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
index f17fa78..39b4417 100644
--- a/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-war/src/main/java/org/apache/wiki/WikiEngine.java
@@ -829,7 +829,7 @@ public class WikiEngine
{
pageName = getFrontPage();
}
- return getURLConstructor().makeURL( WikiContext.VIEW, pageName, true, null );
+ return getURLConstructor().makeURL(WikiContext.VIEW, pageName, "absolute".equals(PROP_REFSTYLE), null);
}
/**