diff options
| -rw-r--r-- | data/pages/wiki/syntax.txt | 2 | ||||
| -rw-r--r-- | inc/parserutils.php | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/data/pages/wiki/syntax.txt b/data/pages/wiki/syntax.txt index 7e9ca4110..29da4d842 100644 --- a/data/pages/wiki/syntax.txt +++ b/data/pages/wiki/syntax.txt @@ -222,7 +222,7 @@ DokuWiki converts commonly used [[wp>emoticon]]s to their graphical equivalents. "He thought 'It's a man's world'..." </code> -Please note: These conversions can be turned off in the config file. +Please note: These conversions can be turned off through a [[doku>wiki:config#typography|config option]] and a [[doku>wiki:entities|pattern file]]. ===== Quoting ===== diff --git a/inc/parserutils.php b/inc/parserutils.php index 0a476b998..daeb94f50 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -275,9 +275,12 @@ function p_get_parsermodes(){ $std_modes = array('listblock','preformatted','notoc','nocache', 'header','table','linebreak','footnote','hr', 'unformatted','php','html','code','file','quote', - 'multiplyentity','quotes','internallink','rss', - 'media','externallink','emaillink','windowssharelink', - 'eol'); + 'internallink','rss','media','externallink', + 'emaillink','windowssharelink','eol'); + if($conf['typography']){ + $std_modes[] = 'quotes'; + $std_modes[] = 'multiplyentity'; + } foreach($std_modes as $m){ $class = "Doku_Parser_Mode_$m"; $obj = new $class(); |