You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by al...@apache.org on 2026/09/24 21:19:11 UTC

(jspwiki) 01/01: Merge pull request #530 from apache/bug/JSPWIKI-1293

This is an automated email from the ASF dual-hosted git repository.

spyhunter99 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 71be70c2d37c88b7413dc35f34e8ac1cf185a893
Merge: 9f3d9cafe 63f3c1254
Author: spyhunter99 <sp...@users.noreply.github.com>
AuthorDate: Thu Sep 24 17:19:05 2026 -0400

    Merge pull request #530 from apache/bug/JSPWIKI-1293
    
    JSPWIKI-1293 see jira for details

 .../main/java/org/apache/wiki/plugin/IfPlugin.java |  23 ++--
 .../apache/wiki/plugin/ReferredPagesPlugin.java    |  25 ++--
 .../org/apache/wiki/util/TimeLimitedRegex.java     | 142 +++++++++++++++++++++
 .../org/apache/wiki/util/TimeLimitedRegexTest.java |  46 +++++++
 4 files changed, 212 insertions(+), 24 deletions(-)

diff --cc jspwiki-main/src/main/java/org/apache/wiki/plugin/IfPlugin.java
index d4a749a50,15bbb640f..311592db9
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/IfPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/IfPlugin.java
@@@ -20,14 -20,7 +20,8 @@@
  package org.apache.wiki.plugin;
  
  import org.apache.commons.lang3.StringUtils;
- import org.apache.oro.text.regex.MalformedPatternException;
- import org.apache.oro.text.regex.Pattern;
- import org.apache.oro.text.regex.PatternCompiler;
- import org.apache.oro.text.regex.PatternMatcher;
- import org.apache.oro.text.regex.Perl5Compiler;
- import org.apache.oro.text.regex.Perl5Matcher;
  import org.apache.wiki.api.core.Context;
 +import org.apache.wiki.api.core.Page;
  import org.apache.wiki.api.exceptions.PluginException;
  import org.apache.wiki.api.plugin.Plugin;
  import org.apache.wiki.api.providers.WikiProvider;