This is an automated email from the ASF dual-hosted git repository. alexoree pushed a commit to branch release/v3.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 95dc7e1e6e923b7b0b465a059072966599168e9a Author: Alex O'Ree <[email protected]> AuthorDate: Tue Mar 31 19:54:17 2026 -0400 addresses peer review discovered issue, reverts the test change from previous commit --- .../src/test/java/org/apache/wiki/filters/FilterFrom210Test.java | 4 ++-- .../main/java/org/apache/wiki/variables/DefaultVariableManager.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jspwiki-210-adapters/src/test/java/org/apache/wiki/filters/FilterFrom210Test.java b/jspwiki-210-adapters/src/test/java/org/apache/wiki/filters/FilterFrom210Test.java index fc10f0a27..bb4257526 100644 --- a/jspwiki-210-adapters/src/test/java/org/apache/wiki/filters/FilterFrom210Test.java +++ b/jspwiki-210-adapters/src/test/java/org/apache/wiki/filters/FilterFrom210Test.java @@ -45,11 +45,11 @@ public class FilterFrom210Test { final TwoXFilter txf = ( TwoXFilter )fm.getFilterList().stream().filter( f -> f instanceof TwoXFilter ).findAny().get(); // post save triggers page references' update which in turn renders the page, which in turn triggers the preTranslate // filter method, so we end up with 5 invocations to any given filter on a page save + 1 more from initialize - Assertions.assertEquals( 3, txf.invocations() ); + Assertions.assertEquals( 6, txf.invocations() ); final WikiContext context = new WikiContext( engine, new WikiPage( engine, "Testpage" ) ); final String res = rm.textToHTML( context,"Incredible and super important content here" ); // test only pre / post translate - Assertions.assertEquals( "Incredible and super important content here", res ); + Assertions.assertEquals( "see how I care about yor content - hmmm...", res ); } } diff --git a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java index 00219b79a..83a72c7f7 100644 --- a/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java +++ b/jspwiki-main/src/main/java/org/apache/wiki/variables/DefaultVariableManager.java @@ -153,7 +153,9 @@ public class DefaultVariableManager implements VariableManager { } // Faster than doing equalsIgnoreCase() final String name = varName.toLowerCase(); - if ( name.startsWith( "jspwiki" ) ) { + if (!"jspwiki.frontpage".equals(name) && + !"jspwiki.runfilters".equals(name) && + name.startsWith( "jspwiki" ) ) { LOG.warn("variable manager is denying access to '" + name + "'"); return ""; } @@ -161,8 +163,6 @@ public class DefaultVariableManager implements VariableManager { if( name.equals( value ) ) { return ""; // FIXME: Should this be something different? } - if ("jspwiki.frontpage".equals(name)) continue; - if ("jspwiki.runfilters".equals(name) ) continue; } try {
