aboutsummaryrefslogtreecommitdiffstats
path: root/include/bbcode.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-02 17:47:47 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-02 17:47:47 -0700
commit7cbc5048743bc5976e48cd3f81801550c0b7f52f (patch)
treef9effa684ef44298d1922bd715d7b1ca9823374d /include/bbcode.php
parentf3b95f591a7ec49b6fc148913861bae2bb6aa6c7 (diff)
parent86ff31f5003312a6c1bcb65c7aa25ad001f542d4 (diff)
downloadvolse-hubzilla-7cbc5048743bc5976e48cd3f81801550c0b7f52f.tar.gz
volse-hubzilla-7cbc5048743bc5976e48cd3f81801550c0b7f52f.tar.bz2
volse-hubzilla-7cbc5048743bc5976e48cd3f81801550c0b7f52f.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'include/bbcode.php')
-rw-r--r--include/bbcode.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 0415d8a73..b8a62a2f2 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -1008,5 +1008,5 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
function strip_bbimage($s) {
- $Text = preg_replace("/\[[zi]mg(.*?)\](.*?)\[\/[zi]mg\]/ism", '', $Text);
+ return preg_replace("/\[[zi]mg(.*?)\](.*?)\[\/[zi]mg\]/ism", '', $s);
}