Merge branch 'master' of https://github.com/redmatrix/redmatrix

2015-06-02 17:47:47 -07:00
parent f3b95f591a 86ff31f500
commit 7cbc504874
10 changed files with 380 additions and 371 deletions
--- 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);
 }