You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/10/29 23:22:29 UTC
[jspwiki] branch master updated: 2.11.0-M1-git-06: fix JSPs using
methods removed on 2.11.0-M1-git-05
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
The following commit(s) were added to refs/heads/master by this push:
new a8e07a0 2.11.0-M1-git-06: fix JSPs using methods removed on 2.11.0-M1-git-05
a8e07a0 is described below
commit a8e07a00f1c3a243fa2cd7d9dc5b05cceee185ec
Author: juanpablo <ju...@apache.org>
AuthorDate: Tue Oct 30 00:21:52 2018 +0100
2.11.0-M1-git-06: fix JSPs using methods removed on 2.11.0-M1-git-05
---
ChangeLog | 4 ++++
jspwiki-main/src/main/java/org/apache/wiki/Release.java | 2 +-
jspwiki-war/src/main/webapp/Search.jsp | 2 +-
jspwiki-war/src/main/webapp/templates/210/AJAXSearch.jsp | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 60adfa3..36ddbc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-10-30 Juan Pablo Santos (juanpablo AT apache DOT org)
+
+ * 2.11.0-M1-git-06: fix JSPs using methods removed on 2.11.0-M1-git-05
+
2018-10-29 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.11.0-M1-git-05: maven build refactor
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/Release.java b/jspwiki-main/src/main/java/org/apache/wiki/Release.java
index 5991e00..98cc9ae 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/Release.java
+++ b/jspwiki-main/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 = "5";
+ public static final String BUILD = "6";
/**
* This is the generic version string you should use when printing out the version. It is of
diff --git a/jspwiki-war/src/main/webapp/Search.jsp b/jspwiki-war/src/main/webapp/Search.jsp
index a512a7a..fb0c143 100644
--- a/jspwiki-war/src/main/webapp/Search.jsp
+++ b/jspwiki-war/src/main/webapp/Search.jsp
@@ -50,7 +50,7 @@
try
{
- list = wiki.findPages( query, wikiContext );
+ list = wiki.getSearchManager().findPages( query, wikiContext );
pageContext.setAttribute( "searchresults",
list,
diff --git a/jspwiki-war/src/main/webapp/templates/210/AJAXSearch.jsp b/jspwiki-war/src/main/webapp/templates/210/AJAXSearch.jsp
index b47172d..2e42cf5 100644
--- a/jspwiki-war/src/main/webapp/templates/210/AJAXSearch.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/AJAXSearch.jsp
@@ -56,7 +56,7 @@
{
try
{
- Collection list = wiki.findPages( query, wikiContext );
+ Collection list = wiki.getSearchManager().findPages( query, wikiContext );
// Filter down to only those that we actually have a permission to view
AuthorizationManager mgr = wiki.getAuthorizationManager();