-- Fix Diaspora profile update avatar bugs

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
index c30908e2d48a18c3eebf31790fd9330ff08d5a28..ef4a9aa9ba3462747f5ba5a30d69e565e77c077c 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -198,10 +198,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 
        $a = get_app();
 
-       // Move all spaces out of the tags
-       $Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
-       $Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
-
        // Hide all [noparse] contained bbtags by spacefying them
        // POSSIBLE BUG --> Will the 'preg' functions crash if there's an embedded image?
 
@@ -210,6 +206,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
        $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$Text);
 
 
+       // Move all spaces out of the tags
+       $Text = preg_replace("/\[(\w*)\](\s*)/ism", '$2[$1]', $Text);
+       $Text = preg_replace("/(\s*)\[\/(\w*)\]/ism", '[/$2]$1', $Text);
+
        // Extract the private images which use data url's since preg has issues with
        // large data sizes. Stash them away while we do bbcode conversion, and then put them back
        // in after we've done all the regex matching. We cannot use any preg functions to do this.