diff --git a/api/parsers/MarkdownParser.cfc b/api/parsers/MarkdownParser.cfc index d828cdf20..d670d7705 100644 --- a/api/parsers/MarkdownParser.cfc +++ b/api/parsers/MarkdownParser.cfc @@ -5,14 +5,16 @@ component { public any function init() { variables.flexmark = false; //experimental https://luceeserver.atlassian.net/browse/LD-109 - _setupMarkdownProcessor(); + //_setupMarkdownProcessor(); _setupNoticeBoxRenderer(); return this; } public string function _markdownToHtml( required string markdown, required boolean stripParagraph=false) { - if (variables.flexmark){ + if (true){ + var html = markdownToHtml( arguments.markdown ); + } else if (variables.flexmark){ var processor = _getMarkdownProcessor(); var doc = processor.parser.parse(arguments.markdown); var html = processor.renderer.render( doc ); diff --git a/api/reference/FunctionReferenceReader.cfc b/api/reference/FunctionReferenceReader.cfc index f136bb56d..de85ec6e2 100644 --- a/api/reference/FunctionReferenceReader.cfc +++ b/api/reference/FunctionReferenceReader.cfc @@ -77,8 +77,8 @@ component accessors=true { // load java tags variables.extensionMap = {}; var cfg = getPageContext().getConfig(); - var flds = cfg.getCombinedFLDs(1); - var ff = flds.getFunctions() + var flds = cfg.getFLDs(); + var ff = flds.getFunctions(); for (var fname in ff){ var bi = bundleInfo( ff[fname].getBIF() ); if ( bi.name != "lucee.core" ) { diff --git a/api/reference/TagReferenceReader.cfc b/api/reference/TagReferenceReader.cfc index d4118d1d9..8dc300c56 100644 --- a/api/reference/TagReferenceReader.cfc +++ b/api/reference/TagReferenceReader.cfc @@ -89,7 +89,7 @@ component accessors=true { // load java tags variables.extensionMap = {}; var cfg = getPageContext().getConfig(); - var tlds = cfg.getTLDs(1); + var tlds = cfg.getTLDs(); //dump(tlds); abort; var tags = tlds[1].getTags(); //dump(tags); abort; diff --git a/serve.bat b/serve.bat index 7ef1054f2..0fdd86244 100644 --- a/serve.bat +++ b/serve.bat @@ -4,4 +4,4 @@ set CWD=%cd% set LUCEE_EXTENSIONS="60772C12-F179-D555-8E2CD2B4F7428718;version=3.0.0.44-RC" box stop name=luceedocslocalserver -box start name=luceedocslocalserver directory=%CWD%/server/ force=true rewritesEnable=true rewritesConfig=%CWD%/server/urlrewrite.xml port=4040 trayIcon=%CWD%/luceelogoicon.png heapSize=2048 cfengine="lucee@5" +box start name=luceedocslocalserver directory=%CWD%/server/ force=true rewritesEnable=true rewritesConfig=%CWD%/server/urlrewrite.xml port=4040 trayIcon=%CWD%/luceelogoicon.png heapSize=2048 cfengine="lucee@be" --verbose --console