aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-07-20 05:38:19 -0400
committerAndrew Manning <tamanning@zoho.com>2016-07-20 05:38:19 -0400
commit99f7dd0fd42b4e29715c86062691877653a8b022 (patch)
treed6bf1cdad168d21947e4b5971c5bdfcc6cf99cca /include/text.php
parent0c7ad924a846eef183ca442be837b69a6014075a (diff)
parent9421e42dad0bee6e0aa292d390cf249e1d7f7df4 (diff)
downloadvolse-hubzilla-99f7dd0fd42b4e29715c86062691877653a8b022.tar.gz
volse-hubzilla-99f7dd0fd42b4e29715c86062691877653a8b022.tar.bz2
volse-hubzilla-99f7dd0fd42b4e29715c86062691877653a8b022.zip
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'include/text.php')
-rw-r--r--include/text.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index ea29babd8..324004438 100644
--- a/include/text.php
+++ b/include/text.php
@@ -687,7 +687,7 @@ function get_tags($s) {
// ignore anything in a code block
- $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
+ $s = preg_replace('/\[code(.*?)\](.*?)\[\/code\]/sm','',$s);
// ignore anything in [style= ]
$s = preg_replace('/\[style=(.*?)\]/sm','',$s);