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
commit 49325691ddd4996e5fc9499bbaef060994b04010 Author: juanpablo <[email protected]> AuthorDate: Sun Jan 5 00:57:31 2020 +0100 JSPWIKI-120: use getPureText from PageManager --- jspwiki-war/src/main/webapp/Comment.jsp | 2 +- jspwiki-war/src/main/webapp/templates/210/editors/CKeditor.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/210/editors/plain.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/210/editors/wysiwyg.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/default/editors/CKeditor.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/default/editors/TinyMCE.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp | 4 ++-- jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/jspwiki-war/src/main/webapp/Comment.jsp b/jspwiki-war/src/main/webapp/Comment.jsp index 5b998a9..d1b90a1 100644 --- a/jspwiki-war/src/main/webapp/Comment.jsp +++ b/jspwiki-war/src/main/webapp/Comment.jsp @@ -181,7 +181,7 @@ // Build comment part // - StringBuffer pageText = new StringBuffer(wiki.getPureText( wikipage )); + StringBuffer pageText = new StringBuffer(wiki.getPageManager().getPureText( wikipage )); log.debug("Page initial contents are "+pageText.length()+" chars"); diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/CKeditor.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/CKeditor.jsp index a99e778..71bdce9 100644 --- a/jspwiki-war/src/main/webapp/templates/210/editors/CKeditor.jsp +++ b/jspwiki-war/src/main/webapp/templates/210/editors/CKeditor.jsp @@ -76,7 +76,7 @@ { if( mgr.checkPermission( context.getWikiSession(), pp ) ) { - usertext = engine.getPureText( p ); + usertext = engine.getPageManager().getPureText( p ); } } catch( Exception e ) { /*log.error( "Accessing clone page "+clone, e );*/ } @@ -87,7 +87,7 @@ <% if( usertext == null ) { - usertext = engine.getPureText( context.getPage() ); + usertext = engine.getPageManager().getPureText( context.getPage() ); } %> </wiki:CheckRequestContext> diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp index 16e33a0..4d5ca8d 100644 --- a/jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp +++ b/jspwiki-war/src/main/webapp/templates/210/editors/FCK.jsp @@ -65,7 +65,7 @@ { if( mgr.checkPermission( context.getWikiSession(), pp ) ) { - usertext = engine.getPureText( p ); + usertext = engine.getPageManager().getPureText( p ); } } catch( Exception e ) { /*log.error( "Accessing clone page "+clone, e );*/ } @@ -76,7 +76,7 @@ <% if( usertext == null ) { - usertext = engine.getPureText( context.getPage() ); + usertext = engine.getPageManager().getPureText( context.getPage() ); }%> </wiki:CheckRequestContext> <% if( usertext == null ) usertext = ""; diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp index 0073bbb..1ce9593 100644 --- a/jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp +++ b/jspwiki-war/src/main/webapp/templates/210/editors/TinyMCE.jsp @@ -76,7 +76,7 @@ { if( mgr.checkPermission( context.getWikiSession(), pp ) ) { - usertext = engine.getPureText( p ); + usertext = engine.getPageManager().getPureText( p ); } } catch( Exception e ) { /*log.error( "Accessing clone page "+clone, e );*/ } @@ -87,7 +87,7 @@ <% if( usertext == null ) { - usertext = engine.getPureText( context.getPage() ); + usertext = engine.getPageManager().getPureText( context.getPage() ); } %> </wiki:CheckRequestContext> diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/plain.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/plain.jsp index 22c1c34..7b8b7cb 100644 --- a/jspwiki-war/src/main/webapp/templates/210/editors/plain.jsp +++ b/jspwiki-war/src/main/webapp/templates/210/editors/plain.jsp @@ -58,7 +58,7 @@ { if( mgr.checkPermission( context.getWikiSession(), pp ) ) { - usertext = engine.getPureText( p ); + usertext = engine.getPageManager().getPureText( p ); } } catch( Exception e ) { /*log.error( "Accessing clone page "+clone, e );*/ } @@ -69,7 +69,7 @@ <% if( usertext == null ) { - usertext = engine.getPureText( context.getPage() ); + usertext = engine.getPageManager().getPureText( context.getPage() ); } %> </wiki:CheckRequestContext> diff --git a/jspwiki-war/src/main/webapp/templates/210/editors/wysiwyg.jsp b/jspwiki-war/src/main/webapp/templates/210/editors/wysiwyg.jsp index 3bc866c..3eeba15 100644 --- a/jspwiki-war/src/main/webapp/templates/210/editors/wysiwyg.jsp +++ b/jspwiki-war/src/main/webapp/templates/210/editors/wysiwyg.jsp @@ -58,7 +58,7 @@ { if( mgr.checkPermission( context.getWikiSession(), pp ) ) { - usertext = engine.getPureText( p ); + usertext = engine.getPageManager().getPureText( p ); } } catch( Exception e ) { /*log.error( "Accessing clone page "+clone, e );*/ } @@ -69,7 +69,7 @@ <% if( usertext == null ) { - usertext = engine.getPureText( context.getPage() ); + usertext = engine.getPageManager().getPureText( context.getPage() ); } %> </wiki:CheckRequestContext> diff --git a/jspwiki-war/src/main/webapp/templates/default/editors/CKeditor.jsp b/jspwiki-war/src/main/webapp/templates/default/editors/CKeditor.jsp index c3c60e2..081e5cd 100644 --- a/jspwiki-war/src/main/webapp/templates/default/editors/CKeditor.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/editors/CKeditor.jsp @@ -78,7 +78,7 @@ { if( mgr.checkPermission( context.getWikiSession(), pp ) ) { - usertext = engine.getPureText( p ); + usertext = engine.getPageManager().getPureText( p ); } } catch( Exception e ) { /*log.error( "Accessing clone page "+clone, e );*/ } @@ -89,7 +89,7 @@ <% if( usertext == null ) { - usertext = engine.getPureText( context.getPage() ); + usertext = engine.getPageManager().getPureText( context.getPage() ); } %> </wiki:CheckRequestContext> diff --git a/jspwiki-war/src/main/webapp/templates/default/editors/TinyMCE.jsp b/jspwiki-war/src/main/webapp/templates/default/editors/TinyMCE.jsp index 2acd953..2965c13 100644 --- a/jspwiki-war/src/main/webapp/templates/default/editors/TinyMCE.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/editors/TinyMCE.jsp @@ -76,7 +76,7 @@ { if( mgr.checkPermission( context.getWikiSession(), pp ) ) { - usertext = engine.getPureText( p ); + usertext = engine.getPageManager().getPureText( p ); } } catch( Exception e ) { /*log.error( "Accessing clone page "+clone, e );*/ } @@ -87,7 +87,7 @@ <% if( usertext == null ) { - usertext = engine.getPureText( context.getPage() ); + usertext = engine.getPageManager().getPureText( context.getPage() ); } %> </wiki:CheckRequestContext> diff --git a/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp b/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp index bc657a6..d91cedb 100644 --- a/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/editors/plain.jsp @@ -58,7 +58,7 @@ { if( mgr.checkPermission( context.getWikiSession(), pp ) ) { - usertext = engine.getPureText( p ); + usertext = engine.getPageManager().getPureText( p ); } } catch( Exception e ) { /*log.error( "Accessing clone page "+clone, e );*/ } @@ -69,7 +69,7 @@ <% if( usertext == null ) { - usertext = engine.getPureText( context.getPage() ); + usertext = engine.getPageManager().getPureText( context.getPage() ); } %> </wiki:CheckRequestContext> diff --git a/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp b/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp index 6c62d9a..ba2e504 100644 --- a/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp +++ b/jspwiki-war/src/main/webapp/templates/default/editors/wysiwyg.jsp @@ -70,7 +70,7 @@ { if( mgr.checkPermission( context.getWikiSession(), pp ) ) { - usertext = engine.getPureText( p ); + usertext = engine.getPageManager().getPureText( p ); } } catch( Exception e ) { /*log.error( "Accessing clone page "+clone, e );*/ } @@ -81,7 +81,7 @@ <% if( usertext == null ) { - usertext = engine.getPureText( context.getPage() ); + usertext = engine.getPageManager().getPureText( context.getPage() ); } %> </wiki:CheckRequestContext>
