diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/features.php | 9 | ||||
| -rw-r--r-- | include/markdown.php | 11 | ||||
| -rw-r--r-- | include/network.php | 4 |
3 files changed, 20 insertions, 4 deletions
diff --git a/include/features.php b/include/features.php index f84c9cb05..d8d98dbaa 100644 --- a/include/features.php +++ b/include/features.php @@ -364,6 +364,15 @@ function get_features($filtered = true) { t('Post/Comment Tools'), [ + 'markdown', + t('Markdown'), + t('Use markdown for editing posts'), + false, + get_config('feature_lock','markdown'), + feature_level('markdown',2), + ], + + [ 'commtag', t('Community Tagging'), t('Ability to tag existing posts'), diff --git a/include/markdown.php b/include/markdown.php index 0cd9ab237..0464cf71a 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -49,14 +49,17 @@ function markdown_to_bb($s, $use_zrl = false, $options = []) { $s = $x['text']; - // Escaping the hash tags - doesn't always seem to work - // $s = preg_replace('/\#([^\s\#])/','\\#$1',$s); - // This seems to work + // Escaping the hash tags $s = preg_replace('/\#([^\s\#])/','#$1',$s); $s = MarkdownExtra::defaultTransform($s); - $s = str_replace("\r","",$s); + if($options && $options['preserve_lf']) { + $s = str_replace(["\r","\n"],["",'<br>'],$s); + } + else { + $s = str_replace("\r","",$s); + } $s = str_replace('#','#',$s); diff --git a/include/network.php b/include/network.php index 7e2dbf4cf..2f29a70c4 100644 --- a/include/network.php +++ b/include/network.php @@ -716,6 +716,10 @@ function scale_external_images($s, $include_link = true, $scale_replace = false) $scaled = str_replace($scale_replace[0], $scale_replace[1], $mtch[3]); else $scaled = $mtch[3]; + + if(! strpbrk(substr($scaled,0,1),'zhfmt')) + continue; + $i = z_fetch_url($scaled,true); |