diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 48fda6296..b03100fc9 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -50,7 +50,7 @@ use Friendica\Util\XML; class BBCode { // Update this value to the current date whenever changes are made to BBCode::convert - const VERSION = '2021-04-24'; + const VERSION = '2021-05-01'; const INTERNAL = 0; const API = 2; @@ -1731,7 +1731,7 @@ class BBCode $text); } elseif (!$simple_html) { $text = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", - '$1$3', + '$1$3', $text); } diff --git a/view/templates/profile/vcard.tpl b/view/templates/profile/vcard.tpl index c4e9ea1d1..b989923b7 100644 --- a/view/templates/profile/vcard.tpl +++ b/view/templates/profile/vcard.tpl @@ -1,7 +1,7 @@
{{$profile.address nofilter}}
{{/if}} @@ -37,7 +37,7 @@ {{if $homepage}}{{$profile.address nofilter}}
{{/if}} @@ -21,7 +21,7 @@{{$profile.address nofilter}}
{{/if}} - {{if $profile.location}}{{$profile.location}}
{{/if}} -{{$profile.address nofilter}}
{{/if}} + {{if $profile.location}}{{$profile.location}}
{{/if}} +{{$profile.address nofilter}}
{{/if}} @@ -44,7 +44,7 @@ {{if $homepage}}