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/19 23:07:28 UTC

(jspwiki) 01/01: Merge pull request #520 from apache/bug/JSPWIKI-1292

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 f18505b91e9fff29fb4f77b3ed4aa56b9551b30b
Merge: b578a7857 50b89b9fe
Author: spyhunter99 <sp...@users.noreply.github.com>
AuthorDate: Sat Sep 19 19:07:21 2026 -0400

    Merge pull request #520 from apache/bug/JSPWIKI-1292
    
    JSPWIKI-1292 see jira for details

 .../apache/wiki/parser/JSPWikiMarkupParser.java    |  4 ++--
 .../java/org/apache/wiki/parser/PluginContent.java |  7 ++++--
 .../wiki/render/WysiwygEditingRendererTest.java    | 26 ++++++++++++++++++++++
 .../main/webapp/templates/210/editors/CKeditor.jsp |  2 +-
 .../main/webapp/templates/210/editors/TinyMCE.jsp  |  2 +-
 .../webapp/templates/default/editors/CKeditor.jsp  |  2 +-
 .../webapp/templates/default/editors/TinyMCE.jsp   |  2 +-
 .../webapp/templates/default/editors/wysiwyg.jsp   |  2 +-
 8 files changed, 38 insertions(+), 9 deletions(-)