To keeps things constant, I have added a ~colon~ literal. Here is the patch:
diff --git a/lib/core/JisonParser/Wiki/HtmlCharacter.php b/lib/core/JisonParser/Wiki/HtmlCharacter.php index 54a8f14..b2d2784 100644 --- a/lib/core/JisonParser/Wiki/HtmlCharacter.php +++ b/lib/core/JisonParser/Wiki/HtmlCharacter.php @@ -22,6 +22,7 @@ class JisonParser_Wiki_HtmlCharacter 'lt' => array('exp' => '/~lt~/i', 'output' => '<'), 'gt' => array('exp' => '/~gt~/i', 'output' => '>'), 'rm' => array('exp' => '/[{]rm[}]/i','output' => '‏'), + ':' => array('exp' => '/~colon~/', 'output' => ':'), // HTML numeric character entities 'num' => array('exp' => '/~([0-9]+)~/','output' =>'&#$1;'), ); diff --git a/lib/parser/parserlib.php b/lib/parser/parserlib.php index adc03ef..bf737e9 100644 --- a/lib/parser/parserlib.php +++ b/lib/parser/parserlib.php @@ -164,6 +164,7 @@ class ParserLib extends TikiDb_Bridge $data = preg_replace("/ -- /", " — ", $data); $data = preg_replace("/~lt~/i", "<", $data); $data = preg_replace("/~gt~/i", ">", $data); + $data = preg_replace("/~colon~/", ":", $data); // HTML numeric character entities $data = preg_replace("/~([0-9]+)~/", "&#$1;", $data); diff --git a/lib/test/core/JisonParser/OutputTest.php b/lib/test/core/JisonParser/OutputTest.php index cdcb4ab..9460b5d 100644 --- a/lib/test/core/JisonParser/OutputTest.php +++ b/lib/test/core/JisonParser/OutputTest.php @@ -125,6 +125,7 @@ class JisonParser_OutputTest extends JisonParser_Abstract 'dash2' => array(' -- ', ' — '), 'lt' => array('~lt~', '<'), 'gt' => array('~gt~', '>'), + 'colon' => array('~colon~', ':'), //$content = preg_replace("/~([0-9]+)~/", "&#$1;", $content); //block level syntax diff --git a/templates/tiki-edit_help.tpl b/templates/tiki-edit_help.tpl index 806309f..99b767e 100644 --- a/templates/tiki-edit_help.tpl +++ b/templates/tiki-edit_help.tpl @@ -96,6 +96,7 @@ {literal}~rsq~{/literal} ’, {literal}~--~{/literal} —, {literal}~bs~{/literal} \, +{literal}~colon~{/literal} :, {tr}numeric between ~ for HTML numeric characters entity{/tr}</td></tr> </table>
To help developers solve the bug, we kindly request that you demonstrate your bug on a show2.tiki.org instance. To start, simply select a version and click on "Create show2.tiki.org instance". Once the instance is ready (in a minute or two), as indicated in the status window below, you can then access that instance, login (the initial admin username/password is "admin") and configure the Tiki to demonstrate your bug. Priority will be given to bugs that have been demonstrated on show2.tiki.org.
Unable to connect to show.tikiwiki.org. Please let us know of the problem so that we can do something about it. Thanks.
filename | created | hits | comment | version | filetype | ||
---|---|---|---|---|---|---|---|
No attachments for this item |